Changeset 13917

Timestamp:

2007-02-15T10:54:47+13:00 (17 years ago)

Author:

kjdon

Message:

levels now go into collectionconfig as well as build config, have displayItems, and names and shortnames likeindexes

File:

• trunk/gsdl3/bin/script/convert_coll_from_gs2.pl (modified) (6 diffs)

trunk/gsdl3/bin/script/convert_coll_from_gs2.pl

@@ -179 +179 @@
     # keeps the order for indexes
     my @indexlist = ();
-    my $firstindex = "";
+    my $defaultindex = "";
     my $first = 1;
     my $maptype = "indexfieldmap";
@@ -192 +192 @@
         push @indexlist, $k;
         if ($first) {
-        $firstindex = $v;
+        $defaultindex = $v;
         $first = 0;
         }   
@@ -200 +200 @@
     }
     # we use the shortname for default index
-    my $defaultindex;
     if (defined $collectcfg->{'defaultindex'}) {
     $defaultindex = $collectcfg->{'defaultindex'};
     $defaultindex = $indexmap->{$defaultindex};
-    } else {
-    # use the first one
-    $defaultindex = $firstindex;
-    }
-    
+    }
+    
+    #  levels
+    my $levelmap = {};
+    my @levellist = ();
+    my $default_search_level = "";
+    my $default_retrieve_level = "Sec";
+    $first = 1;
+    if ($buildtype eq "mgpp" || $buildtype eq "lucene") {
+    if (defined $buildcfg->{'levelmap'}) {
+        my $levelmap_t = $buildcfg->{'levelmap'};
+        foreach my $l (@$levelmap_t) {
+        my ($k, $v) = $l =~ /^(.*)\-\>(.*)$/;
+        $levelmap->{$k} = $v;
+        push @levellist, $k;
+        if ($first) {
+            $default_search_level = $v;
+            $first = 0;
+        }
+        }
+    }
+
+    if (defined $collectcfg->{'defaultlevel'}) {
+        $default_search_level = $collectcfg->{'defaultlevel'};
+        $default_search_level = $levelmap->{$default_search_level};
+    }
+    if (defined $buildcfg->{'textlevel'}) {
+        $default_retrieve_level = $buildcfg->{'textlevel'};
+    }
+    }
     # format stuff
     my $format = $collectcfg->{'format'};
@@ -225 +249 @@
     }
 
+    #  level stuff for mgpp/lucene
+    if ($buildtype eq 'mgpp' || $buildtype eq 'lucene'){
+    foreach my $l (keys %$levelmap) {
+        $collwriter->startTag('level', 'name'=>$l);
+        #find the coll meta stuff
+        my $leveldisplay = ".$l";
+        foreach my $lang (keys %{$collectionmeta->{$leveldisplay}}) {
+        my $value = $collectionmeta->{$leveldisplay}->{$lang};
+        output_display($collwriter, 'name', $lang, $value);
+        }
+        $collwriter->endTag('level');
+    }
+    }
     # add in the format stuff
     if (defined $format->{'SearchVList'}) {
@@ -252 +289 @@
 
     #do the retrieve service
-    # assume mgpp or mg 
+    $buildwriter->startTag('serviceRack', 'name'=>"GS2".$service_type."Retrieve");
     if ($buildtype eq 'mgpp' || $buildtype eq 'lucene') {
-    #for each level
-    if (defined $buildcfg->{'indexlevels'}) {
-        push @levels, @{$buildcfg->{'indexlevels'}};
-        
-        if (defined $buildcfg->{'textlevel'}) {
-        $defaultlevel = $buildcfg->{'textlevel'};
-        } else {
-        $defaultlevel = $levels[0];
-        }
-    } else { #use levels from collect.cfg - must be an old collection
-        @levels = ('Document');
-        $defaultlevel = 'Document';
-        if (defined $collectcfg->{'levels'}) {
-        foreach my $l (@{$collectcfg->{'levels'}}) {
-            if ($l eq "Section") {
-            $defaultlevel = 'Section';
-            }
-            push @levels, $l;
-        }
-        }
-    }
-    $buildwriter->startTag('serviceRack', 'name'=>"GS2".$service_type."Retrieve");
-    $buildwriter->emptyTag('defaultLevel', 'name'=>$defaultlevel);
-
-    
+    $buildwriter->emptyTag('defaultLevel', 'shortname'=>$default_retrieve_level);
     } elsif ($buildtype eq "mg") {
-    $buildwriter->startTag('serviceRack', 'name'=>'GS2MGRetrieve');
     $buildwriter->emptyTag('defaultIndex', 'shortname'=>$defaultindex);
     
@@ -432 +444 @@
         
     # level info
-    $buildwriter->emptyTag('defaultLevel', 'name'=>$defaultlevel);
+    $buildwriter->emptyTag('defaultLevel', 'shortname'=>$default_search_level);
+    $buildwriter->emptyTag('defaultGDBMLevel', 'shortname'=>$default_retrieve_level);
     $buildwriter->startTag('levelList');
-    foreach my $level (@levels) {
-        $buildwriter->emptyTag('level', 'name'=>$level);
-    }
+    foreach my $l (@levellist) {
+        my $level = $levelmap->{$l};
+        $buildwriter->emptyTag('level', 'name'=>$l, 'shortname'=>$level);
+    }   
     $buildwriter->endTag('levelList');