Changeset 85 for trunk/gsdl/perllib

Timestamp:

1998-12-21T15:12:32+13:00 (26 years ago)

Author:

rjmcnab

Message:

Fixed a few small bugs.

Location:

trunk/gsdl/perllib

Files:

• doc.pm (modified) (4 diffs)
• mgbuilder.pm (modified) (2 diffs)

trunk/gsdl/perllib/doc.pm

@@ -53 +53 @@
 
 # returns the source_filename as it was provided
+# the default of "indexed_doc" is used if no document
+# type was provided
 sub get_doc_type {
     my $self = shift (@_);
 
-    return $self->get_metadata_element ($self->get_top_section(), "gsdldoctype");
+    my $doc_type = $self->get_metadata_element ($self->get_top_section(), "gsdldoctype");
+    return $doc_type if (defined $doc_type);
+    return "indexed_doc";
+}
+
+sub _escape_text {
+    my ($text) = @_;
+
+    # special characters in the gml encoding
+    $text =~ s/&/&/g; # this has to be first...
+    $text =~ s/</&lt;/g;
+    $text =~ s/>/&gt;/g;
+    $text =~ s/\"/&quot;/g;
+
+    return $text;
 }
 
@@ -75 +91 @@
     print $handle " gsdlnum=\"$section_num\"" if defined $section_num;
     foreach $data (@{$section_ptr->{'metadata'}}) {
-    print $handle " $data->[0]=\"$data->[1]\"" 
+    print $handle " $data->[0]=\"" . &_escape_text($data->[1]) . "\"" 
         unless $suppress_subject_info && $data->[0] eq "Subject";
     }
@@ -81 +97 @@
 
     # output the text
-    print $handle $section_ptr->{'text'};
+    print $handle &_escape_text($section_ptr->{'text'});
 
     # output all the subsections
@@ -166 +182 @@
 sub get_OID {
     my $self = shift (@_);
-    
-    return $self->get_metadata_element ($self->get_top_section(), "Identifier");
+    my $OID = $self->get_metadata_element ($self->get_top_section(), "Identifier");
+    return $OID if (defined $OID);
+    return "NULL";
 }
 

trunk/gsdl/perllib/mgbuilder.pm

@@ -269 +269 @@
     my $indexexparr = [];
     my ($level, $fields, $subcollection) = split (":", $index);
-    my (@subcollections) = split /,/, $subcollection;
+    my @subcollections = ();
+    @subcollections = split /,/, $subcollection if (defined $subcollection);
 
     foreach $subcollection (@subcollections) {
@@ -359 +360 @@
     &util::mk_all_dir ($textdir);
 
-    # assume little-endian for now :-)
-    my $fulldbname = &util::filename_cat ($textdir, "$self->{'collection'}.ldb");
+    # get db name
+    my $dbext = ".bdb";
+    $dbext = ".ldb" if &util::is_little_endian();
+    my $fulldbname = &util::filename_cat ($textdir, "$self->{'collection'}$dbext");
     $fulldbname =~ s/\//\\/g if ($ENV{'GSDLOS'} =~ /^windows$/i);
+
     my $exedir = "$ENV{'GSDLHOME'}/bin/$ENV{'GSDLOS'}";
     my $exe = &util::get_os_exe ();