diff options
Diffstat (limited to 'lib/sisu/v3dv/manifest.rb')
| -rw-r--r-- | lib/sisu/v3dv/manifest.rb | 30 | 
1 files changed, 15 insertions, 15 deletions
| diff --git a/lib/sisu/v3dv/manifest.rb b/lib/sisu/v3dv/manifest.rb index 36988cec..30e645b4 100644 --- a/lib/sisu/v3dv/manifest.rb +++ b/lib/sisu/v3dv/manifest.rb @@ -72,15 +72,15 @@ module SiSU_Manifest    class Source      def initialize(opt)        @opt=opt -      @particulars=SiSU_Particulars::Combined_singleton.instance.get_all(opt) -      l=SiSU_Env::Standardise_language.new(@opt.lng).language +      @particulars=SiSU_Particulars::CombinedSingleton.instance.get_all(opt) +      l=SiSU_Env::StandardiseLanguage.new(@opt.lng).language        @doc_language=l[:n]      end      def read        begin -        @env=SiSU_Env::Info_env.new(@opt.fns) +        @env=SiSU_Env::InfoEnv.new(@opt.fns)          @md=SiSU_Param::Parameters.new(@opt).get -        SiSU_Env::Info_skin.new(@md).select +        SiSU_Env::InfoSkin.new(@md).select          xbrowser=@env.program.web_browser          browser=@env.program.console_web_browser  #       webserv_url=@env.path.url.output_tell #fix in sysenv @@ -91,25 +91,25 @@ module SiSU_Manifest            : SiSU_Screen::Ansi.new(@opt.cmd,'Manifest',"[#{@opt.f_pth[:lng_is]}] #{@opt.fns}").green_title_hi            SiSU_Screen::Ansi.new(@opt.cmd,"#{browser} #{url_html}").grey_tab if @opt.cmd =~/v/i          end -        data=SiSU_HTML::Source::Html_environment.new(@particulars).tuned_file_instructions -        Output_Info.new(@md).check_output(data) -      rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd,@opt.fns).error +        data=SiSU_HTML::Source::HTML_Environment.new(@particulars).tuned_file_instructions +        OutputInfo.new(@md).check_output(data) +      rescue; SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error        ensure        end      end      private -    class Output_Info <Source +    class OutputInfo <Source        def initialize(md)          @manifest={ txt: [], html: [] }          @md,@fns=md,md.fns -        @env=SiSU_Env::Info_env.new(@md.fns) +        @env=SiSU_Env::InfoEnv.new(@md.fns)          @fnb=@md.fnb          @base_url="#{@env.url.root}/#{@fnb}"          @f=SiSU_Env::FileOp.new(@md)          @base_path=@f.output_path.manifest.dir -        @@dg ||=SiSU_Env::Info_env.new.digest.type +        @@dg ||=SiSU_Env::InfoEnv.new.digest.type          @dg=@@dg -        l=SiSU_Env::Standardise_language.new(@md.opt.lng).language +        l=SiSU_Env::StandardiseLanguage.new(@md.opt.lng).language          @language=l[:n]          @translate=SiSU_Translate::Source.new(@md,@language)          @brace_url=SiSU_Viz::Skin.new.url_decoration @@ -135,7 +135,7 @@ module SiSU_Manifest          @manifest[:html] << %{<tr><th class="left"><p class="norm"><a href="#{rel}/#{file}">#{img}#{id}</a></p></th><td><p class="small"><a href="#{rel}/#{file}">#{file}</a></p><p class="tiny">#{@brace_url.xml_open}<a href="#{url}/#{file}">#{url}/#{file}</a>#{@brace_url.xml_close}</p></td><td class="right"><p class="right">#{kb}</p></td></tr>\n}        end        def summarize_sources(id,file,pth,rel,url) -        sys=SiSU_Env::System_call.new +        sys=SiSU_Env::SystemCall.new          dgst =if @dg =~/^sha(?:2|256)$/; sys.sha256("#{pth}/#{file}")          else                             sys.md5("#{pth}/#{file}")          end @@ -731,9 +731,9 @@ WOK        end        def check_output(data)          begin -          minitoc=SiSU_HTML_MiniToc::Toc_mini.new(@md,data).songsheet.join("\n") +          minitoc=SiSU_HTML_MiniToc::TocMini.new(@md,data).songsheet.join("\n")            id,file='','' -          vz=SiSU_Env::Get_init.instance.skin +          vz=SiSU_Env::GetInit.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/  <<WOK @@ -853,7 +853,7 @@ WOK  </html>  WOK            output -        rescue; SiSU_Errors::Info_error.new($!,$@,@md.opt.cmd,@md.fns).error +        rescue; SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error          ensure          end        end | 
