diff options
Diffstat (limited to 'lib/sisu/v0/manifest.rb')
| -rw-r--r-- | lib/sisu/v0/manifest.rb | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/lib/sisu/v0/manifest.rb b/lib/sisu/v0/manifest.rb index 0776f4d1..e0617fec 100644 --- a/lib/sisu/v0/manifest.rb +++ b/lib/sisu/v0/manifest.rb @@ -240,16 +240,18 @@ module SiSU_Manifest id,file='Markup Composite File (SiSU source)',req summarize_source(id,file) end - end - if FileTest.file?("#@base_path_src/#{@md.fns}")==true - id,file='Markup (SiSU source)',@md.fns - summarize_source(id,file) + else + if FileTest.file?("#@base_path_src/#{@md.fns}")==true + id,file='Markup (SiSU source)',@md.fns + summarize_source(id,file) + end end if FileTest.file?("#@base_path_src/#{@md.fn[:sisupod]}")==true id,file='SiSU doc (zip)',@md.fn[:sisupod] summarize_source(id,file) end - if FileTest.file?("#@base_path/#{@md.fnb}")==true and @md.fnb =~/\.kdi$/ + if FileTest.file?("#@base_path/#{@md.fnb}")==true \ + and @md.fnb =~/\.kdi$/ id,file='Kdissert (.kdi source)',@md.fnb summarize_source(id,file) end @@ -339,11 +341,13 @@ module SiSU_Manifest id,info=@translate.date_valid,@md.dc_date_valid metadata(id,info) end - if @md.dc_language and @md.dc_language[:name] + if @md.dc_language \ + and @md.dc_language[:name] id,info=@translate.language,@md.dc_language[:name] metadata(id,info) end - if @md.language_original and @md.language_original[:name] + if @md.language_original \ + and @md.language_original[:name] id,info=@translate.language_original,@md.language_original[:name] metadata(id,info) end @@ -437,14 +441,17 @@ module SiSU_Manifest end end def links_tests - if defined? @md.lnk and @md.lnk + if defined? @md.lnk \ + and @md.lnk @md.lnk.each do |l| if defined? l[:say] target=if l[:url] !~/^\.(\.)?\//; 'external' else '_top' end url,lnk=l[:url],l[:say] - unless url.nil? or url.empty?; links(url,lnk,target) + unless url.nil? \ + or url.empty? + links(url,lnk,target) end end end @@ -454,7 +461,8 @@ module SiSU_Manifest begin id,file='','' vz=SiSU_Env::Get_init.instance.skin - banner_table=if vz.banner_home_button_only !~ /http:\/\/www\.jus\.uio\.no\/sisu/ and vz.banner_home_button_only !~ /sisu\.home\.png/ + banner_table=if vz.banner_home_button_only !~ /http:\/\/www\.jus\.uio\.no\/sisu/ \ + and vz.banner_home_button_only !~ /sisu\.home\.png/ <<WOK <table summary="band" width="100%" border="0" cellpadding="3" cellspacing="0"> <tr><td align="left" bgcolor="#ffffff">#{vz.banner_band}</td><td width="60%"><p class="tiny">#{@url_brace.xml_open}<a href="#@base_url/#{file}">#@base_url/#{file}</a>#{@url_brace.xml_close}</p></td><td width="20%">#{@env.widget_static.search_form}</td><td><a href="http://www.jus.uio.no/sisu/" target="_top"><img border="0" src="#{vz.url_path_image}/sisu.png" alt="SiSU -->" /></a></td></tr> |