dyndoc-convert.rb in dyndoc-ruby-0.9.14

- old
+ new

@@ -246,12 +246,15 @@
       ##Dyndoc.warn :page,page
       code = "[#rb<]require 'ostruct';cfg = OpenStruct.new(" + cfg.inspect + ");page = OpenStruct.new(" + page.inspect + ")[#>]" +code
       code = dyn_tags + code if dyn_tags
 
       ## add path for user
-      code_path = "[#path]"+File.join(opts[:dyn_root],'users',opts[:user],"dynlib")
-      code_path << "\n" << File.join(opts[:dyn_root],'users',opts[:user])
+      code_path = "[#path]"
+      if opts[:user]
+        code_path << "\n" << File.join(opts[:dyn_root],'users',opts[:user],"dynlib")
+        code_path << "\n" << File.join(opts[:dyn_root],'users',opts[:user])
+      end
       code_path << "\n" << File.join(sys_root,'public','users')
       code_path << "\n" << File.join(sys_root,'system','dynlib')
       code_path << "\n" << File.join(opts[:dyn_root],'dynlib')
       code_path << "\n" << opts[:dyn_root] << "\n"
       code_path << "[#main][#<]\n"
@@ -263,10 +266,10 @@
 
       unless opts[:doc_tag] == "__ALL_DOC_TAG__"
         Dyndoc.process_html_file_from_dyn_file(code,html_file,dyn_file,dyn_layout,addr,dyndoc_start)
       else
         (opts[:current_tags] || html_files.keys[1..-1]).each do |doc_tag|
-          html_file=File.join(html_root,["users",opts[:user]] || [],cfg_files[:urls][doc_tag])
+          html_file=File.join(html_root,(opts[:user] ? ["users",opts[:user]] : []),cfg_files[:urls][doc_tag])
           ##p [:html_multi,doc_tag,html_file] #,code.gsub(/__ALL_DOC_TAG__/,doc_tag)]
           Dyndoc.process_html_file_from_dyn_file(code.gsub(/__ALL_DOC_TAG__/,doc_tag),html_file,dyn_file,dyn_layout,addr,dyndoc_start)
         end
       end
     end