Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2

diff --git a/etc/pz2.xsd b/etc/pz2.xsd
index d24b937..c8bc6ba 100644 (file)
--- a/etc/pz2.xsd
+++ b/etc/pz2.xsd
@@ -7,6 +7,7 @@
 >
 
   <xs:element name="collection" type="pz:collection" />
+  <xs:element name="record" type="pz:record" />
 
   <xs:complexType name="collection">
     <xs:sequence>

diff --git a/etc/settings/opencontent-solr.xml b/etc/settings/opencontent-solr.xml
index 1263eee..027bad1 100644 (file)
--- a/etc/settings/opencontent-solr.xml
+++ b/etc/settings/opencontent-solr.xml
@@ -1,10 +1,14 @@
-<settings target="ocs-test.indexdata.com/solr/select">
+<settings target="ocs-test.indexdata.com/solr">
   <set name="pz:name" value="opencontent-solr"/>
   
   <set name="pz:apdulog" value="1"/>
   <!-- mapping for unqualified search -->
-  <set name="pz:cclmap:term" value="1=title"/>
-  
+<!-- It should not be nessesary to have a term mapping 
+     if the solr setup has a default field for searching.
+     On Index Data we use the text field to contain all
+     and has this as default field
+  <set name="pz:cclmap:term" value="1=text"/>
+--> 
   <!-- field-specific mappings -->
   <set name="pz:cclmap:au"   value="1=author" />
   <set name="pz:cclmap:ti"   value="1=title"  />

diff --git a/test/test_termlist_block_settings_2.xml b/test/test_termlist_block_settings_2.xml
index 93b7718..cb730b0 100644 (file)
--- a/test/test_termlist_block_settings_2.xml
+++ b/test/test_termlist_block_settings_2.xml
@@ -1,7 +1,7 @@
 <!-- Solr target -->
 <settings target="id_solr">
   <set name="pz:name"  value="LOC (SOLR)" />
-  <set name="pz:url"   value="ocs-test.indexdata.com/solr/select" />
+  <set name="pz:url"   value="ocs-test.indexdata.com/solr" />
 
   <set name="pz:cclmap:term"  value="1=text s=Dal" />
   <set name="pz:cclmap:au"    value="1=author"   />
@@ -36,4 +36,4 @@
   <set name="use_thumbnails" value="0"        />
   <set name="pz:queryencoding"  value="UTF-8" />
 
-</settings>
\ No newline at end of file
+</settings>