ML: comitting after merge ML_test Root_JL_TEST
authormlang
Wed, 06 Jul 2005 11:27:02 +0200
branchML_test
changeset 29180f98637eff6
parent 290 3f76f7d39384
ML: comitting after merge
admin/projplans/ML.txt
src/java/isac/util/genhtml/GenHTML.java
     1.1 --- a/admin/projplans/ML.txt	Wed Jul 06 11:20:15 2005 +0200
     1.2 +++ b/admin/projplans/ML.txt	Wed Jul 06 11:27:02 2005 +0200
     1.3 @@ -1,18 +1,4 @@
     1.4 -Projektplan Martin Lang
     1.5 -
     1.6 -Goals:
     1.7 -
     1.8 -Update Requirements
     1.9 -- manage thousands of examples
    1.10 -- same stylesheets for browsers and minibrowsers
    1.11 -- there is a html-editor, which creates code the minibrwoser can read without problems
    1.12 -- ...
    1.13 -
    1.14 -Detailed design
    1.15 -- stylesheets for examples, problems, mehtods
    1.16 -- generation of html-error protocolls (erro while loading html-page)
    1.17 -- start example from problem hirarchy + special case input a new example(?)
    1.18 -- ##############################################################################
    1.19 +##############################################################################
    1.20  # sub-task: Example collections in application-oriented math learning
    1.21  # of:	    Martin Lang
    1.22  ##############################################################################
     2.1 --- a/src/java/isac/util/genhtml/GenHTML.java	Wed Jul 06 11:20:15 2005 +0200
     2.2 +++ b/src/java/isac/util/genhtml/GenHTML.java	Wed Jul 06 11:27:02 2005 +0200
     2.3 @@ -44,27 +44,9 @@
     2.4  
     2.5      static final int SIMPLE_PBL_NODE = 5;
     2.6  
     2.7 -    //static String destination_ = "/netshares/studenthomes/mlang/proto_v2/isac/proto2/isac/xmldata/";
     2.8 -    static String destination_ = "/netshares/studenthomes/mlang/xmldata/";	
     2.9 -   // static String destination_ = "/netshares/studenthomes/mlang/test_xml/";	
    2.10 -    
    2.11 -    /**
    2.12 -     * Method derived from HttpServlet to react on an request by an web-browser
    2.13 -     * AG? ................^^^^^^^^^^^ ???
    2.14 -     * 
    2.15 -     * @param request
    2.16 -     *            object which holds informations about the request like the URL
    2.17 -     *            used to access this servlet
    2.18 -     * @param arg1
    2.19 -     *            object which provides methods to return the results to the
    2.20 -     *            web-browser.
    2.21 -     * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest,
    2.22 -     *      javax.servlet.http.HttpServletResponse)
    2.23 -     */
    2.24 +    static String destination_ = "/home/neuper/proto2/www/kbase/";
    2.25  
    2.26 -   
    2.27 -   //FIXXME arguments for destination_ in main 
    2.28 -    public static void main(String[] argv) {
    2.29 +   public static void main(String[] argv) {
    2.30          if (argv.length > 0) destination_ = argv[0];
    2.31          GenHTML genhtml = new GenHTML();
    2.32          genhtml.buildHierarchy("met/code.html");
    2.33 @@ -378,11 +360,8 @@
    2.34  
    2.35              if (!contentfile.trim().endsWith(".xml")) { return; }
    2.36              out = new FileWriter(destination_ + path + ".html");
    2.37 -            
    2.38 -            String test = InformationProcessor.loadXML(session, command, contentfile);
    2.39 -            System.out.println(test);
    2.40 -            xmlSource = new StreamSource(new StringReader(test));
    2.41 -                       
    2.42 +            xmlSource = new StreamSource(new StringReader(InformationProcessor
    2.43 +                    .loadXML(session, command, contentfile)));
    2.44              xslSource = new StreamSource(getClass().getResourceAsStream(
    2.45                      "/isac/util/genhtml/templates/pbl_node_content.xsl"));
    2.46              //		}