# HG changeset patch
# User mlang
# Date 1120642022 -7200
# Node ID 80f98637eff6e35cc9b801911b9fd3149e0e08b0
# Parent  3f76f7d39384622b0ba726a5a00c9d99580a23f8
ML: comitting after merge

diff -r 3f76f7d39384 -r 80f98637eff6 admin/projplans/ML.txt
--- a/admin/projplans/ML.txt	Wed Jul 06 11:20:15 2005 +0200
+++ b/admin/projplans/ML.txt	Wed Jul 06 11:27:02 2005 +0200
@@ -1,18 +1,4 @@
-Projektplan Martin Lang
-
-Goals:
-
-Update Requirements
-- manage thousands of examples
-- same stylesheets for browsers and minibrowsers
-- there is a html-editor, which creates code the minibrwoser can read without problems
-- ...
-
-Detailed design
-- stylesheets for examples, problems, mehtods
-- generation of html-error protocolls (erro while loading html-page)
-- start example from problem hirarchy + special case input a new example(?)
-- ##############################################################################
+##############################################################################
 # sub-task: Example collections in application-oriented math learning
 # of:	    Martin Lang
 ##############################################################################
diff -r 3f76f7d39384 -r 80f98637eff6 src/java/isac/util/genhtml/GenHTML.java
--- a/src/java/isac/util/genhtml/GenHTML.java	Wed Jul 06 11:20:15 2005 +0200
+++ b/src/java/isac/util/genhtml/GenHTML.java	Wed Jul 06 11:27:02 2005 +0200
@@ -44,27 +44,9 @@
 
     static final int SIMPLE_PBL_NODE = 5;
 
-    //static String destination_ = "/netshares/studenthomes/mlang/proto_v2/isac/proto2/isac/xmldata/";
-    static String destination_ = "/netshares/studenthomes/mlang/xmldata/";	
-   // static String destination_ = "/netshares/studenthomes/mlang/test_xml/";	
-    
-    /**
-     * Method derived from HttpServlet to react on an request by an web-browser
-     * AG? ................^^^^^^^^^^^ ???
-     * 
-     * @param request
-     *            object which holds informations about the request like the URL
-     *            used to access this servlet
-     * @param arg1
-     *            object which provides methods to return the results to the
-     *            web-browser.
-     * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest,
-     *      javax.servlet.http.HttpServletResponse)
-     */
+    static String destination_ = "/home/neuper/proto2/www/kbase/";
 
-   
-   //FIXXME arguments for destination_ in main 
-    public static void main(String[] argv) {
+   public static void main(String[] argv) {
         if (argv.length > 0) destination_ = argv[0];
         GenHTML genhtml = new GenHTML();
         genhtml.buildHierarchy("met/code.html");
@@ -378,11 +360,8 @@
 
             if (!contentfile.trim().endsWith(".xml")) { return; }
             out = new FileWriter(destination_ + path + ".html");
-            
-            String test = InformationProcessor.loadXML(session, command, contentfile);
-            System.out.println(test);
-            xmlSource = new StreamSource(new StringReader(test));
-                       
+            xmlSource = new StreamSource(new StringReader(InformationProcessor
+                    .loadXML(session, command, contentfile)));
             xslSource = new StreamSource(getClass().getResourceAsStream(
                     "/isac/util/genhtml/templates/pbl_node_content.xsl"));
             //		}