Changeset 24305

Timestamp:

2011-07-22T17:21:42+12:00 (12 years ago)

Author:

ak19

Message:

The collectionmeta field related to titles in modelcol's collect.cfg now contains ex.dc.Title. For its display in the indexes drop-down of the search page to map to the titles display name, needed to adjust the lookup that runtime-src's collectserver does.

Location:

main/trunk/greenstone2

Files:

• collect/modelcol/etc/collect.cfg (modified) (2 diffs)
• runtime-src/src/colservr/collectserver.cpp (modified) (1 diff)

main/trunk/greenstone2/collect/modelcol/etc/collect.cfg

@@ -6 +6 @@
 infodbtype  **infodbtype**
 
-indexes     text dc.Title,ex.Title ex.Source
+indexes     text dc.Title,ex.dc.Title,ex.Title ex.Source
 defaultindex    text
 
@@ -20 +20 @@
 collectionmeta collectionextra   "**about**"
 collectionmeta  .text "_labeltext_"
-collectionmeta  .dc.Title,Title "_labelTitle_"
+collectionmeta  .dc.Title,ex.dc.Title,ex.Title "_labelTitle_"
 collectionmeta  .Source "_labelSource_"
 collectionmeta .document "_textdocument_"

main/trunk/greenstone2/runtime-src/src/colservr/collectserver.cpp

@@ -203 +203 @@
     text_t name = substr(cfgline[0].begin()+1,cfgline[0].end());
     text_t new_name;
+    
+    // make sure that any ex.XXX metadata in the string is turned into XXX for matching
+    name.replace("ex.","");
+
     if (indexmap.from2to(name, new_name)) {
       meta_name = new_name;