[ckan-changes] commit/ckanextiati: pudo: update solr index

Tue May 24 15:06:29 UTC 2011

1 new changeset in ckanextiati:

http://bitbucket.org/okfn/ckanextiati/changeset/ef32fb74145f/
changeset:   r61:ef32fb74145f
user:        pudo
date:        2011-05-24 17:06:21
summary:     update solr index
affected #:  3 files (701 bytes)

--- a/solr/schema.xml	Tue May 24 16:34:37 2011 +0200
+++ b/solr/schema.xml	Tue May 24 17:06:21 2011 +0200
@@ -92,32 +92,30 @@
 
  <fields><field name="id" type="string" indexed="true" stored="true" required="true" /> 
-	 <field name="site_id" type="string" indexed="true" stored="true" required="true" /> 
+     <field name="site_id" type="string" indexed="true" stored="true" required="true" /><field name="title" type="text" indexed="true" stored="true" />
-	 <field name="entity_type" type="string" indexed="true" stored="true" omitNorms="true" />
-	 <field name="state" type="string" indexed="true" stored="true" omitNorms="true" />
+     <field name="entity_type" type="string" indexed="true" stored="true" omitNorms="true" />
+     <field name="state" type="string" indexed="true" stored="true" omitNorms="true" /><field name="name" type="string" indexed="true" stored="true" omitNorms="true" /><field name="revision_id" type="string" indexed="true" stored="true" omitNorms="true" /><field name="version" type="string" indexed="true" stored="true" /><field name="url" type="string" indexed="true" stored="true" omitNorms="true" /><field name="ckan_url" type="string" indexed="true" stored="true" omitNorms="true" />
-	 <field name="download_url" type="string" indexed="true" stored="true" omitNorms="true" />
-	 <field name="notes" type="text" indexed="true" stored="true"/>
-	 <field name="author" type="textgen" indexed="true" stored="true" />
-	 <field name="author_email" type="textgen" indexed="true" stored="true" />
-	 <field name="maintainer" type="textgen" indexed="true" stored="true" />
-	 <field name="maintainer_email" type="textgen" indexed="true" stored="true" />
-	 <field name="license" type="textgen" indexed="true" stored="true" />
-	 <field name="license_id" type="string" indexed="true" stored="true" />
+     <field name="download_url" type="string" indexed="true" stored="true" omitNorms="true" />
+     <field name="notes" type="text" indexed="true" stored="true"/>
+     <field name="author" type="textgen" indexed="true" stored="true" />
+     <field name="author_email" type="textgen" indexed="true" stored="true" />
+     <field name="maintainer" type="textgen" indexed="true" stored="true" />
+     <field name="maintainer_email" type="textgen" indexed="true" stored="true" />
+   <field name="license" type="string" indexed="true" stored="true" />
+     <field name="license_id" type="string" indexed="true" stored="true" /><field name="ratings_count" type="int" indexed="true" stored="false" /><field name="ratings_average" type="float" indexed="true" stored="false" />
-   <field name="tags" type="textgen" indexed="true" stored="true" multiValued="true"/>
-
-   <field name="groups" type="string" indexed="true" stored="true" omitNorms="true" multiValued="true"/>
-	 <field name="groups_types" type="string" indexed="true" stored="true" omitNorms="true" multiValued="true"/>
-
-	 <field name="res_description" type="textgen" indexed="true" stored="true" multiValued="true"/>
-	 <field name="res_format" type="string" indexed="true" stored="true" multiValued="true"/>
+     <field name="tags" type="string" indexed="true" stored="true" multiValued="true"/>
+   <field name="groups" type="string" indexed="true" stored="true" multiValued="true"/>
+     
+     <field name="res_description" type="textgen" indexed="true" stored="true" multiValued="true"/>
+     <field name="res_format" type="string" indexed="true" stored="true" multiValued="true"/><field name="res_url" type="string" indexed="true" stored="true" multiValued="true"/><!-- catchall field, containing all other searchable text fields (implemented
@@ -125,30 +123,43 @@
    <field name="text" type="text" indexed="true" stored="false" multiValued="true"/><field name="urls" type="text" indexed="true" stored="false" multiValued="true"/>
 
-   <field name="country" type="string" indexed="true" stored="true" omitNorms="true" />
-   <field name="donors" type="string" indexed="true" stored="true" omitNorms="true" multiValued="true" />
-   <field name="donors_type" type="string" indexed="true" stored="true" omitNorms="true" multiValued="true" />
-   <field name="donors_country" type="string" indexed="true" stored="true" omitNorms="true" multiValued="true" />
-
+   <field name="depends_on" type="text" indexed="true" stored="false" multiValued="true"/>
+   <field name="dependency_of" type="text" indexed="true" stored="false" multiValued="true"/>
+   <field name="derives_from" type="text" indexed="true" stored="false" multiValued="true"/>
+   <field name="has_derivation" type="text" indexed="true" stored="false" multiValued="true"/>
+   <field name="links_to" type="text" indexed="true" stored="false" multiValued="true"/>
+   <field name="linked_from" type="text" indexed="true" stored="false" multiValued="true"/>
+   <field name="child_of" type="text" indexed="true" stored="false" multiValued="true"/>
+   <field name="parent_of" type="text" indexed="true" stored="false" multiValued="true"/>
+   <field name="extras_*" type="text" indexed="true" stored="true" multiValued="true"/>
+   <field name="groups_types" type="string" indexed="true" stored="true" omitNorms="true" multiValued="true"/><field name="indexed_ts" type="date" indexed="true" stored="true" default="NOW" multiValued="false"/>
-   
    <dynamicField name="*" type="string" indexed="true"  stored="false"/></fields><uniqueKey>id</uniqueKey><defaultSearchField>text</defaultSearchField>
- <solrQueryParser defaultOperator="OR"/>
-
- <copyField source="title" dest="text"/>
- <copyField source="text" dest="text"/>
- <copyField source="notes" dest="text"/>
- <copyField source="res_description" dest="text"/>
- <copyField source="maintainer" dest="text"/>
- <copyField source="author" dest="text"/>
+ <solrQueryParser defaultOperator="AND"/><copyField source="url" dest="urls"/><copyField source="ckan_url" dest="urls"/><copyField source="download_url" dest="urls"/><copyField source="res_url" dest="urls"/>
+ 
+
+ <copyField source="extras_*" dest="text"/>
+ <copyField source="urls" dest="text"/>
+ <copyField source="title" dest="text"/>
+ <copyField source="text" dest="text"/>
+ <copyField source="license" dest="text"/>
+ <copyField source="notes" dest="text"/>
+ <copyField source="tags" dest="text"/>
+ <copyField source="groups" dest="text"/>
+ <copyField source="res_description" dest="text"/>
+ <copyField source="maintainer" dest="text"/>
+ <copyField source="author" dest="text"/>
+
 </schema>
+
+


--- a/templates/layout_base.html	Tue May 24 16:34:37 2011 +0200
+++ b/templates/layout_base.html	Tue May 24 17:06:21 2011 +0200
@@ -73,10 +73,10 @@
                 <strong>${h.icon('user')} <span id="ckan_user_name">username</span></strong><br/><a href="${h.url_for(controller='user',action=None,id=None)}">My account</a>
-          · <a href="${h.url_for('/logout_openid')}">Logout</a>
+          · <a href="/user/logout">Logout</a></span><span class="ckan_logged_out">
-                <a href="${h.url_for(controller='user',action='login', id=None)}">Login with ${h.icon('openid')} OpenID</a>
+                <a href="${h.url_for(controller='user',action='login', id=None)}">Login</a></span></div>
 


--- a/templates/package/search_form.html	Tue May 24 16:34:37 2011 +0200
+++ b/templates/package/search_form.html	Tue May 24 17:06:21 2011 +0200
@@ -18,7 +18,7 @@
     </tr><tr><td>Country:</td>
-        <td>${h.select('country', dict(c.fields).get('country', '') if c.facets else '',  country_options)}</td>
+        <td>${h.select('extras_country', dict(c.fields).get('extras_country', '') if c.facets else '',  country_options)}</td></tr></table>

Repository URL: https://bitbucket.org/okfn/ckanextiati/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.


