Changeset 16950 for gsdl/trunk/perllib/doc.pm

Timestamp:

2008-08-21T16:17:14+12:00 (16 years ago)

Author:

ak19

Message:

Added some convenience methods to get often-used metadata: Source, SourceFile, next to the one added earlier for getting the assoc_filename from the SourceFile

File:

• gsdl/trunk/perllib/doc.pm (modified) (4 diffs)

gsdl/trunk/perllib/doc.pm

@@ -179 +179 @@
                  $converted_filename);
 }
-
 
 # returns the source_filename as it was provided
@@ -932 +931 @@
 }
 
-# get the actual name of the assocfile from SourceFile which is the url referring to it 
-sub assocfile_from_sourcefile {
+# returns the Source meta, which is the utf8 filename generated.
+# Added a separate method here for convenience
+sub get_source {
+    my $self = shift (@_);
+    return $self->get_metadata_element ($self->get_top_section(), "Source");
+}
+
+# returns the SourceFile meta, which is the url reference to the URL-encoded
+# version of Source (the utf8 filename). Added a separate method here for convenience
+sub get_sourcefile {
+    my $self = shift (@_);
+    return $self->get_metadata_element ($self->get_top_section(), "SourceFile");
+}
+
+# Get the actual name of the assocfile, a url-encoded string derived from SourceFile.
+# The SourceFile meta is the (escaped) url reference to the url-encoded assocfile.
+sub get_assocfile_from_sourcefile {
     my $self = shift (@_);
     
@@ -945 +959 @@
     return $assocfilename;
 }
-
 
 # methods for dealing with associated files
@@ -957 +970 @@
     my ($real_filename, $assoc_filename, $mime_type, $section) = @_;
     $mime_type = &ghtml::guess_mime_type ($real_filename) unless defined $mime_type;
-
-#   my ($cpackage,$cfilename,$cline,$csubr,$chas_args,$cwantarray) = caller(1);
-#   print STDERR "Calling method; $cfilename:$cline $cpackage->$csubr\n";
 
     # remove all associated files with the same name