Changeset 9214

Timestamp:

2005-02-28T15:47:00+13:00 (19 years ago)

Author:

kjdon

Message:

now set a gdbm_level in buildproc, so can tell whether to number documents by doc num or section num

Location:

trunk/gsdl/perllib

Files:

• lucenebuilder.pm (modified) (4 diffs)
• lucenebuildproc.pm (modified) (2 diffs)

trunk/gsdl/perllib/lucenebuilder.pm

@@ -112 +112 @@
     }
     my $levels = $self->{'levels'};
+    my $gdbm_level = "document";
+    if ($levels->{'section'}) {
+    $gdbm_level = "section";
+    }
+
     undef $levels->{'paragraph'}; # get rid of para if we had it.
     # set up the document processr
@@ -121 +126 @@
     $self->{'buildproc'}->set_indexfieldmap ($self->{'indexfieldmap'});
     $self->{'buildproc'}->set_levels ($levels);                       
+    $self->{'buildproc'}->set_gdbm_level ($gdbm_level);                       
     $self->{'buildproc'}->reset();
     &plugin::begin($self->{'pluginfo'}, $self->{'source_dir'}, 
@@ -275 +281 @@
     
     my $store_levels = $self->{'levels'};
-
+    my $gdbm_level = "document";
+    if ($store_levels->{'section'}) {
+    $gdbm_level = "section";
+    }
+    
     my $dom_level = "";
     foreach my $key (keys %$store_levels) {
@@ -297 +307 @@
     $self->{'buildproc'}->set_indexfieldmap ($self->{'indexfieldmap'});
     $self->{'buildproc'}->set_levels ($local_levels);                       
+    $self->{'buildproc'}->set_gdbm_level($gdbm_level);
     $self->{'buildproc'}->reset();
     &plugin::read ($self->{'pluginfo'}, $self->{'source_dir'}, 

trunk/gsdl/perllib/lucenebuildproc.pm

@@ -46 +46 @@
 }
 
+sub set_gdbm_level {
+    my $self = shift(@_);
+    my ($level) = @_;
+
+    $self->{'gdbm_level'} = $level;
+}
 sub preprocess_text {
     my $self = shift (@_);
@@ -141 +147 @@
     my $docid="";
     if ($ldoc_level) {
-    if ($lsec_level) {
-        
+    if ($self->{'gdbm_level'} eq 'document') {
+        my $doc_sec_num = $self->{'num_docs'};  
+        $docid = "gs2:id=\"$doc_sec_num\"";
+    } else  {
+        # default is section level
         my $doc_sec_num = $self->{'num_sections'}+1;    
         $docid = "gs2:id=\"$doc_sec_num\"";
-    } else {
-        my $doc_sec_num = $self->{'num_docs'};  
-        $docid = "gs2:id=\"$doc_sec_num\"";
-    }
-    }
-
+    }
+    }
     my $documenttag = "<$doc_level $gs2ns file=\"$file\" $docid >\n";
     my $documentendtag = "\n</$doc_level>\n";