Changeset 22372 for main

Timestamp:

2010-07-09T18:30:29+12:00 (14 years ago)

Author:

ak19

Message:

None of Fedora, the GS3 democlient and Greenstone seem to require the first associated file to have a datastream named url, so the special handling for this has been removed.

File:

• main/trunk/greenstone2/perllib/plugouts/FedoraMETSPlugout.pm (modified) (6 diffs)

main/trunk/greenstone2/perllib/plugouts/FedoraMETSPlugout.pm

@@ -155 +155 @@
 }
 
-
-#sub adjust_text_before_saving()
-sub adjust_links()
+sub adjust_links
 {
     my $self = shift(@_);
@@ -163 +161 @@
 
     ## change links to be Fedora cognant:
-    # 1. retrieve txt  $$textref ???
+    # 1. retrieve txt of section - $$textref
     # 2. change it:
     # /$ENV{'FEDORA_PREFIX'}/objects/$greenstone-docobj-hash-xxx/datastreams/FG<orig-img-name>/content
-    # (Note that the first image is always "url", instead of FG<orig-img-name>)
     # 3. only replace it back in doc_obj if we didn't get a ref in the first place
 
     my $OID = $doc_obj->get_OID();
     my $fnamespace = $self->{'fedora_namespace'};
-    my $replace_img_name = 1;
     if($OID ne "collection" && defined $fnamespace) {
     my $fed_id = "$fnamespace:".$ENV{'GSDLCOLLECTION'}."-$OID"; #oid_namespace:collection-OID
-    my $fedora_url_prefix = $ENV{'FEDORA_PREFIX'}."/objects/$fed_id/datastreams/";
+    my $fedora_url_prefix = $ENV{'FEDORA_PREFIX'}."/objects/$fed_id/datastreams/FG";
     my $fedora_url_suffix = "/content";
 
-    $$textref =~ s/(<(?:img|embed|table|tr|td|link|script)[^>]*?(?:src|background|href)\s*=\s*)((?:[\"][^\"]+[\"])|(?:[\'][^\']+[\'])|(?:[^\s\/>]+))([^>]*>)/$self->replace_rel_link($1, $2, $3, $fedora_url_prefix, $fedora_url_suffix, $replace_img_name--)/isge;
+    $$textref =~ s/(<(?:img|embed|table|tr|td|link|script)[^>]*?(?:src|background|href)\s*=\s*)((?:[\"][^\"]+[\"])|(?:[\'][^\']+[\'])|(?:[^\s\/>]+))([^>]*>)/$self->replace_rel_link($1, $2, $3, $fedora_url_prefix, $fedora_url_suffix)/isge;
 #   print STDERR "*** all text after: $$textref\n\n";
     }
@@ -188 +184 @@
 {
     my $self = shift (@_);
-    my ($front, $link, $back, $url_prefix, $url_suffix, $replace_img_name) = @_;
+    my ($front, $link, $back, $url_prefix, $url_suffix) = @_;
 
     # only process relative links. Return if absolute link
@@ -203 +199 @@
     }
 
-    # remove any _httpdocimg/ that greenstone may have prefixed to the image
+    # remove any _httpdocimg_/ that greenstone may have prefixed to the image
     $link =~ s/^_httpdocimg_(?:\/|\\)//;
-
-    # the datastream of the first image of each section is always called "url"
-    if($replace_img_name) {
-    return "$front$url_prefix"."url"."$url_suffix$back";
-    }
-    # else
-    return "$front$url_prefix"."FG"."$link$url_suffix$back";
+    
+    return "$front$url_prefix$link$url_suffix$back";
 }
 
@@ -683 +674 @@
 
 
-    my $first_assocfile = 1;
-
     foreach my $data (@{$section_ptr->{'metadata'}}){
        my $escaped_value = &docprint::escape_text($data->[1]);
@@ -695 +684 @@
        my $assoc_dir  = $3;
 
-       if ($first_assocfile) {
-           $id_root = "url";
-           $first_assocfile = 0;
-       }
-       else {
-           $id_root = "FG$assoc_file";
-       }
+       $id_root = "FG$assoc_file";
 
        $id_root =~ s/\//_/g;