Changeset 16431

Timestamp:

2008-07-16T16:39:56+12:00 (16 years ago)

Author:

mdewsnip

Message:

Now passes the Greenstone document OID into GS2LuceneIndexer, to help support incremental building.

File:

• gsdl/trunk/perllib/lucenebuildproc.pm (modified) (2 diffs)

gsdl/trunk/perllib/lucenebuildproc.pm

@@ -82 +82 @@
 
     my $doc_level = $mgppbuildproc::level_map{'document'};
-    my $gs2ns = 'xmlns:gs2="http://www.greenstone.org/gs2"';
 
     my $levels = $self->{'levels'};
@@ -89 +88 @@
     my $lpar_level = $levels->{'paragraph'};
 
-    my $docid="";
+    my $gs2_id = "";
     if ($ldoc_level)
-      {
+    {
     if ($self->{'db_level'} eq 'document')
-          {
-        my $doc_sec_num = $self->{'num_docs'};
-        $docid = "gs2:id=\"$doc_sec_num\"";
-          }
+    {
+        $gs2_id = $self->{'num_docs'};
+    }
         else
-          {
+    {
         # default is section level
-        my $doc_sec_num = $self->{'num_sections'} + 1;
-        $docid = "gs2:id=\"$doc_sec_num\"";
-          }
-      }
-    my $documenttag = "<$doc_level $gs2ns file=\"$file\" $docid >\n";
+        $gs2_id = $self->{'num_sections'} + 1;
+    }
+    }
+    my $gs2_docOID = $doc_obj->get_OID();
+    my $documenttag = "<$doc_level xmlns:gs2=\"http://www.greenstone.org/gs2\" file=\"$file\" gs2:id=\"$gs2_id\" gs2:docOID=\"$gs2_docOID\">\n";
     my $documentendtag = "\n</$doc_level>\n";