Changeset 2925

Timestamp:

2002-01-30T14:23:31+13:00 (22 years ago)

Author:

sjboddie

Message:

Altered the format of the GreenstoneArchive and GreenstoneDirectoryMetadata
XML files slightly (they're now called Archive and DirectoryMetadata
respectively).

Location:

trunk/gsdl

Files:

• collect/demo/import/metadata.xml (modified) (1 diff)
• perllib/docsave.pm (modified) (2 diffs)
• perllib/plugins/GAPlug.pm (modified) (2 diffs)
• perllib/plugins/RecPlug.pm (modified) (2 diffs)

trunk/gsdl/collect/demo/import/metadata.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE GreenstoneDirectoryMetadata SYSTEM "http://greenstone.org/dtd/GreenstoneDirectoryMetadata/1.0/GreenstoneDirectoryMetadata.dtd">
+<!DOCTYPE DirectoryMetadata SYSTEM "http://greenstone.org/dtd/DirectoryMetadata/1.0/DirectoryMetadata.dtd">
 <DirectoryMetadata>
 

trunk/gsdl/perllib/docsave.pm

@@ -287 +287 @@
 
     print $handle '<?xml version="1.0" encoding="UTF-8" standalone="no"?>' . "\n";
-    print $handle '<!DOCTYPE GreenstoneArchive SYSTEM ' .
-    '"http://greenstone.org/dtd/GreenstoneArchive/1.0/GreenstoneArchive.dtd">' . "\n";
-    print $handle '<GreenstoneArchive>' . "\n";
+    print $handle '<!DOCTYPE Archive SYSTEM "http://greenstone.org/dtd/Archive/1.0/Archive.dtd">' . "\n";
+    print $handle "<Archive>\n";
 }
 
@@ -296 +295 @@
     my ($handle) = @_;
 
-    print $handle '</GreenstoneArchive>' . "\n";
+    print $handle "</Archive>\n";
 }
 

trunk/gsdl/perllib/plugins/GAPlug.pm

@@ -24 +24 @@
 ###########################################################################
 
-# Processes GreenstoneArchive XML documents. Note that this plugin does no
-# syntax checking (though the XML::Parser module tests for
-# well-formedness). It's assumed that the GreenstoneArchive files conform
-# to their DTD.
+# Processes Greenstone Archive XML documents. Note that this plugin does no
+# syntax checking (though the XML::Parser module tests for well-formedness).
+# It's assumed that the Archive files conform to their DTD.
 
 package GAPlug;
@@ -60 +59 @@
     my ($expat, $name, $sysid, $pubid, $internal) = @_;
 
-    die "" if ($name ne "GreenstoneArchive");
+    # allow the short-lived and badly named "GreenstoneArchive" files to be processed
+    # as well as the "Archive" files which should now be created by import.pl
+    die "" if ($name !~ /^(Greenstone)?Archive$/);
+
     my $outhandle = $self->{'outhandle'};
     print $outhandle "GAPLug: processing $self->{'file'}\n";

trunk/gsdl/perllib/plugins/RecPlug.pm

@@ -35 +35 @@
 
 #<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-#<!DOCTYPE GreenstoneDirectoryMetadata SYSTEM "http://greenstone.org/dtd/GreenstoneDirectoryMetadata/1.0/GreenstoneDirectoryMetadata.dtd">
+#<!DOCTYPE DirectoryMetadata SYSTEM "http://greenstone.org/dtd/DirectoryMetadata/1.0/DirectoryMetadata.dtd">
 #<DirectoryMetadata>
 #  <FileSet>
@@ -301 +301 @@
 sub Doctype {
     my ($expat, $name, $sysid, $pubid, $internal) = @_;
-    die if ($name ne "GreenstoneDirectoryMetadata");
+
+    # allow the short-lived and badly named "GreenstoneDirectoryMetadata" files 
+    # to be processed as well as the "DirectoryMetadata" files which should now
+    # be created by import.pl
+    die if ($name !~ /^(Greenstone)?DirectoryMetadata$/);
 }