Changeset 98

Timestamp:

1999-01-06T14:22:01+13:00 (25 years ago)

Author:

rjmcnab

Message:

Switched doc.pl over to use unicode. Changed the importing software to create
a shallower directory structure. Added subject headings to FBPlug. Changed
bylw's indexes.

Location:

trunk/gsdl

Files:

• bin/script/import.pl (modified) (1 diff)
• perllib/arcinfo.pm (modified) (1 diff)
• perllib/docsave.pm (modified) (1 diff)
• perllib/mgbuilder.pm (modified) (1 diff)
• unicode/MAPPINGS/EASTASIA/GB/makemapfile.pl (modified) (2 diffs)

trunk/gsdl/bin/script/import.pl

@@ -37 +37 @@
     
     # get the list of plugins for this collection
-    @plugins = ("RecPlug", "HTMLPlug", "TXTPlug");
-    if (-e "$ENV{'GSDLHOME'}/collect/$collection/collect.cfg") {
+    @plugins = ("HTMLPlug", "TXTPlug", "RecPlug");
+    if (-e "$ENV{'GSDLHOME'}/collect/$collection/etc/collect.cfg") {
     $collectcfg = &colcfg::read_collect_cfg ("$ENV{'GSDLHOME'}/collect/$collection/etc/collect.cfg");
     if (defined $collectcfg->{'plugins'}) {
         @plugins = @{$collectcfg->{'plugins'}};
     }
+    } else {
+    print STDERR "WARNING - couldn't find collection configuration file\n";
+    print STDERR "          using default plugins\n";
     }
     

trunk/gsdl/perllib/arcinfo.pm

@@ -128 +128 @@
 
 
+# returns the number of documents so far
+sub size {
+    my $self = shift (@_);
+    return (scalar(@{$self->{'order'}}));
+}
+
 1;
 

trunk/gsdl/perllib/docsave.pm

@@ -32 +32 @@
     $OID = "NULL" unless defined $OID;
 
-    # get the document's directory by inserting a / every 1-8 characters
-    # and removing the last /
-    my $doc_dir = $OID;
-    $doc_dir =~ s/(.{1,8})/$1\//g;
-    $doc_dir =~ s/\/$//;
-    $doc_dir .= ".dir";
+    # get the document's directory.
+    my $doc_info = $self->{'archive_info'}->get_info($OID);
+    my $doc_dir = "";
+    if (defined $doc_info && scalar(@$doc_info) >= 1) {
+    # this OID already has an assigned directory, use the
+    # same one.
+    $doc_dir = $doc_info->[0];
+
+    } else {
+    # have to get a new document directory
+    my $doc_dir_rest = $OID;
+    my $doc_dir_num = 0;
+    do {
+        $doc_dir .= "/" if $doc_dir_num > 0;
+        if ($doc_dir_rest =~ s/^(.{1,8})//) {
+        $doc_dir .= $1;
+        $doc_dir_num++;
+        }
+    } while ($doc_dir_rest ne "" && 
+         (-d "$archive_dir/$doc_dir.dir" || 
+          ($self->{'archive_info'}->size() >= 1024 && $doc_dir_num < 2)));
+    $doc_dir .= ".dir";
+    }
+
     &util::mk_all_dir ("$archive_dir/$doc_dir");
 

trunk/gsdl/perllib/mgbuilder.pm

@@ -34 +34 @@
 
     # read in the collection configuration file
-    if (!-e "$ENV{'GSDLHOME'}/collect/$collection/collect.cfg") {
+    if (!-e "$ENV{'GSDLHOME'}/collect/$collection/etc/collect.cfg") {
     die "mgbuilder::new - couldn't find collect.cfg for collection $collection\n";
     }

trunk/gsdl/unicode/MAPPINGS/EASTASIA/GB/makemapfile.pl

@@ -312 +312 @@
                       "unicode/MAPPINGS/EASTASIA/GB",
                       "$encoding.TXT");
-#    if (!&loadencoding ($encoding, $mapfile)) {
-    if (!&loadmapencoding ($encoding)) {
+    if (!&loadencoding ($encoding, $mapfile)) {
+#    if (!&loadmapencoding ($encoding)) {
     die "couldn't load encoding $encoding";
     }
@@ -323 +323 @@
 
 sub main {
-    makeencodingmapfile ("GBK");
-    makeencodingmapfile ("GB2312");
-    makeencodingmapfile ("GB12345");
-}
+    makeencodingmapfile ("BIG5");
+#    makeencodingmapfile ("GBK");
+#    makeencodingmapfile ("GB2312");
+#    makeencodingmapfile ("GB12345");
+}