Changeset 24291

Timestamp:

2011-07-19T14:15:29+12:00 (13 years ago)

Author:

sjm84

Message:

More changes to do with the way PDF files are parsed

Location:

main/trunk/greenstone2/perllib

Files:

• strings.properties (modified) (2 diffs)
• util.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/strings.properties

@@ -274 +274 @@
 import.OIDtype:The method to use when generating unique identifiers for each document.
 import.OIDtype.hash:Hash the contents of the file. Document identifiers will be the same every time the collection is imported.
+import.OIDtype.hash_on_ga_xml:Hash the contents of the Greenstone Archive XML file. Document identifiers will be the same every time the collection is imported as long as the metadata does not change.
 
 import.OIDtype.incremental:Use a simple document count. Significantly faster than "hash", but does not necessarily assign the same identifier to the same document content if the collection is reimported.
@@ -862 +863 @@
 
 EmbeddedMetadataPlugin.desc:Plugin that extracts embedded metadata from a variety of file types. It is based on the CPAN module 'ExifTool which includes support for over 70 file formats and 20 metadata formats.  Highlights include: video formats such as AVI, ASF, FLV, MPEG, OGG Vorbis, and WMV; image formats such as BMP, GIF, JPEG, JPEG 2000 and  PNG; audio formats such as AIFF, RealAudio, FLAC, MP3, and WAV; Office document formats such as Encapsulated PostScript, HTML, PDF, and Word.  More details are available at the ExifTool home page http://www.sno.phy.queensu.ca/~phil/exiftool/
+EmbeddedMetadataPlugin.join_before_split:Join fields with multiple entries (e.g. Authors or Keywords) before they are (optionally) split using the specified separator. 
+EmbeddedMetadataPlugin.join_character:The character to use with join_before_split (default is a single space).
+EmbeddedMetadataPlugin.trim_whitespace:Trim whitespace from start and end of any extracted metadata values (Note: this also applies to any values generated through joining with join_before_split or splitting through metadata_field_separator).
 
 ExcelPlugin.desc:A plugin for importing Microsoft Excel files (versions 95 and 97).

main/trunk/greenstone2/perllib/util.pm

@@ -83 +83 @@
     my ($files,$file_accept_re,$file_reject_re) = @_;
 
+#   my ($cpackage,$cfilename,$cline,$csubr,$chas_args,$cwantarray) = caller(2);
+#   my ($lcfilename) = ($cfilename =~ m/([^\\\/]*)$/);
+#   print STDERR "** Calling method (2): $lcfilename:$cline $cpackage->$csubr\n";
+    
     my @files_array = (ref $files eq "ARRAY") ? @$files : ($files);