Changeset 29045 for main

Timestamp:

2014-05-08T17:59:47+12:00 (10 years ago)

Author:

ak19

Message:

Kathy suggested that the GS3 buildConfig.xml generated from GS2 build.cfg should ideally have the same content as if buildConfig.xml generated from a rebuild of the collection. This is so that a collection converted from GS2 to GS3 can be immediately previewed without rebuilding. Although immediate previewing already worked, the intention is to nevertheless make the automatically-generated buildConfig.xml file as identical as possible to the one generated upon a rebuild.

File:

• main/trunk/greenstone3/bin/script/convert_coll_from_gs2.pl (modified) (9 diffs)

main/trunk/greenstone3/bin/script/convert_coll_from_gs2.pl

@@ -127 +127 @@
     $indexstem = $buildcfg->{'indexstem'};
     }
+    #my $indexstem = $buildcfg->{'indexstem'} || undef;
+    my $infodbtype = $buildcfg->{'infodbtype'} || "gdbm";
+    my $earliestDatestamp = $buildcfg->{'earliestdatestamp'} || undef;
 
     my $buildoutput = new IO::File(">$buildoutfile");
@@ -184 +187 @@
     &output_metadata($buildwriter,'', 'numDocs', $numdocs);
     &output_metadata($buildwriter,'', 'buildType', $buildtype);
+    &output_metadata($buildwriter,'', 'indexStem', $indexstem) if(defined $indexstem);
+    &output_metadata($buildwriter,'', 'infodbType', $infodbtype);
+    &output_metadata($buildwriter,'', 'earliestDatestamp', $earliestDatestamp) if(defined $earliestDatestamp);
     $buildwriter->endTag('metadataList');
     
@@ -431 +437 @@
     if (defined $indexstem) {
     $buildwriter->emptyTag('indexStem', 'name'=>$indexstem);
-    } 
+    }
+    $buildwriter->emptyTag('databaseType', 'name'=>$infodbtype) if (defined $infodbtype);
+    
     # close off the Retrieve service
     $buildwriter->endTag('serviceRack');
@@ -473 +481 @@
         if (defined $indexstem) {
             $buildwriter->emptyTag('indexStem', 'name'=>$indexstem);
-        } 
+        }
+        $buildwriter->emptyTag('databaseType', 'name'=>$infodbtype) if (defined $infodbtype);
 
         $buildwriter->startTag('classifierList');       
@@ -490 +499 @@
             $content = @$cl[$i+1];
             }
-            
+
+            # remove "ex." prefix from "ex.metaname" but not from "ex.namespace.metaname"
+            $content =~ s@ex\.([^.]+)(,|;|$)@$1$2@g; #$content =~ s@ex\.([A-Z])@$1@g;
         }
         }
@@ -564 +575 @@
     $buildwriter->startTag('serviceRack', 'name'=>'GS2'.$service_type.'Search');
     #$buildwriter->emptyTag('defaultIndex', 'shortname'=>$defaultindex);
+    $buildwriter->emptyTag('defaultIndex', 'shortname'=>$indexmap->{$defaultindex});
     $buildwriter->startTag('indexList');
     #for each index
@@ -573 +585 @@
     if (defined $indexstem) {
     $buildwriter->emptyTag('indexStem', 'name'=>$indexstem);
-    } 
+    }
+    $buildwriter->emptyTag('databaseType', 'name'=>$infodbtype) if (defined $infodbtype);
     
     # index options
@@ -597 +610 @@
     # level info
     $buildwriter->emptyTag('defaultLevel', 'shortname'=>$default_search_level_shortname);
-    $buildwriter->emptyTag('defaultGDBMLevel', 'shortname'=>$default_retrieve_level);
+    $buildwriter->emptyTag('defaultDBLevel', 'shortname'=>$default_retrieve_level);
     $buildwriter->startTag('levelList');
     foreach my $l (@levellist) {
@@ -689 +702 @@
     $writer->startTag('metadata', 'name'=>$metaname);
     }
-    $writer->characters($metavalue);
+    $writer->characters($metavalue) if(defined $metavalue);
     $writer->endTag('metadata');
 }