Changeset 21742 for main


Ignore:
Timestamp:
2010-03-01T13:03:47+13:00 (14 years ago)
Author:
kjdon
Message:

should be using assocfilepath instead of archivedir

Location:
main/trunk/greenstone2/perllib/plugins
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone2/perllib/plugins/BasePlugin.pm

    r21315 r21742  
    10881088        my ($pre_doc_ext) = ($file_extended_ext =~ m/^(.*)\..*$/);
    10891089        my ($doc_ext) = ($tail_filename =~ m/^.*\.(.*)$/);
    1090         my $start_doclink = "<a href=\"_httpprefix_/collect/[collection]/index/assoc/{Or}{[parent(Top):archivedir],[archivedir]}/$url_tail_filename\">";
     1090        my $start_doclink = "<a href=\"_httpprefix_/collect/[collection]/index/assoc/{Or}{[parent(Top):assocfilepath],[assocfilepath]}/$url_tail_filename\">";
    10911091        my $srcicon = "_icon".$doc_ext."_";
    10921092        my $end_doclink = "</a>";

  • main/trunk/greenstone2/perllib/plugins/ConvertBinaryFile.pm

    r20766 r21742  
    498498    # We use set instead of add here because we only want one value
    499499    $doc_obj->set_utf8_metadata_element($cursection, "FileFormat", $file_type);
    500     my $doclink = "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[archivedir]/doc.$doc_ext\">";
     500    my $doclink = "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/doc.$doc_ext\">";
    501501    if ($self->{'keep_original_filename'} == 1) {
    502     $doclink = "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[archivedir]/[SourceFile]\">";
     502    $doclink = "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[SourceFile]\">";
    503503    }
    504504    $doc_obj->add_utf8_metadata ($cursection, "srclink",  $doclink);

  • main/trunk/greenstone2/perllib/plugins/ConvertToRogPlugin.pm

    r18327 r21742  
    444444    $doc_obj->associate_file($filename, "doc.$doc_ext", undef, $cursection);
    445445
    446     my $doclink = "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[archivedir]/doc.$doc_ext\">";
     446    my $doclink = "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/doc.$doc_ext\">";
    447447    $doc_obj->add_utf8_metadata ($cursection, "srclink",  $doclink);
    448448    $doc_obj->add_utf8_metadata ($cursection, "srcicon",  "_icon".$doc_ext."_");

  • main/trunk/greenstone2/perllib/plugins/HTMLImagePlugin.pm

    r18327 r21742  
    533533    $doc_obj->add_metadata($section, "PageTitle", $pagetitle);
    534534    $doc_obj->add_metadata($section, "ThumbURL",
    535                "_httpprefix_/collect/[collection]/index/assoc/[archivedir]/$fn.thumb.jpg");
     535               "_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/$fn.thumb.jpg");
    536536    $doc_obj->add_metadata($section, "FileFormat", "W3Img");
    537537
    … …  
    555555    $doc_obj->associate_file($filepath, $onlyfn, undef, $section);
    556556    $doc_obj->add_utf8_metadata($section, "CacheURL",
    557                    "_httpprefix_/collect/[collection]/index/assoc/[archivedir]/$onlyfn");
     557                   "_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/$onlyfn");
    558558    }
    559559    return 1;

  • main/trunk/greenstone2/perllib/plugins/OpenDocumentPlugin.pm

    r20831 r21742  
    262262
    263263    #setup to doclink thingi
    264     my $doclink = "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[archivedir]/$file_only\">";
     264    my $doclink = "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/$file_only\">";
    265265    $doc_obj->add_utf8_metadata ("", "srclink",  $doclink);
    266     $doc_obj->add_utf8_metadata ("", "srcicon",  "<img border=\"0\" align=\"absmiddle\" src=\"_httpprefix_/collect/[collection]/index/assoc/[archivedir]/thumbnail.png\" alt=\"View the Open document\" title=\"View the Open document\">");
     266    $doc_obj->add_utf8_metadata ("", "srcicon",  "<img border=\"0\" align=\"absmiddle\" src=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/thumbnail.png\" alt=\"View the Open document\" title=\"View the Open document\">");
    267267    $doc_obj->add_utf8_metadata ("", "/srclink", "</a>");
    268268    $self->set_Source_metadata($doc_obj, $file_only);
Note: See TracChangeset for help on using the changeset viewer.