Changeset 20730 for gsdl/trunk

Timestamp:

2009-09-28T16:10:57+13:00 (15 years ago)

Author:

kjdon

Message:

now we are using gs2:docOID to find the right section in a document xml file, instead of gs2:id. gs2:id was stored as docnum in the database. when getting the section, gs2:docOID will be the same as the greenstone OID.

Location:

gsdl/trunk/runtime-src/src/colservr

Files:

• expat_document.cpp (modified) (1 diff)
• lucenesource.cpp (modified) (2 diffs)

gsdl/trunk/runtime-src/src/colservr/expat_document.cpp

@@ -35 +35 @@
   text_t element_name = (char*)name;
   if (element_name == *(rpack_ptr->section_level)) {
-    text_t id_att = (char *)get_attribute(attributes,"gs2:id");
+    text_t id_att = (char *)get_attribute(attributes,"gs2:docOID");
     if (id_att == *(rpack_ptr->section_num)) {
       rpack_ptr->store_text = true;

gsdl/trunk/runtime-src/src/colservr/lucenesource.cpp

@@ -74 +74 @@
     return false; // true??
   }
-  int docnum = info["docnum"].getint();
 
   // get the parent id
@@ -90 +89 @@
   doc.clear();
   db_ptr->closedatabase();  // Important that local library doesn't leave any files open
-  expat_document(full_path_to_doc, ((lucenesearchclass*)textsearchptr)->textlevel, text_t(docnum), doc);
+  expat_document(full_path_to_doc, ((lucenesearchclass*)textsearchptr)->textlevel, tOID, doc);
   return true;
 }