[Qsos-commits] qsos/apps/tpl-xuleditor/chrome/content editor.j...

[Raphaël Semeteys]

CVSROOT:        /sources/qsos
Module name:    qsos
Branch:         
Changes by:     Raphaël Semeteys <address@hidden>      06/05/08 21:08:56

Modified files:
        apps/tpl-xuleditor/chrome/content: editor.js newscore.xul 
                                           Template.js 

Log message:
        Scored criteria can also have a desc element

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qsos/qsos/apps/tpl-xuleditor/chrome/content/editor.js.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/qsos/qsos/apps/tpl-xuleditor/chrome/content/newscore.xul.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/qsos/qsos/apps/tpl-xuleditor/chrome/content/Template.js.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: qsos/apps/tpl-xuleditor/chrome/content/Template.js
diff -u qsos/apps/tpl-xuleditor/chrome/content/Template.js:1.6 
qsos/apps/tpl-xuleditor/chrome/content/Template.js:1.7
--- qsos/apps/tpl-xuleditor/chrome/content/Template.js:1.6      Sun Apr 23 
22:58:17 2006
+++ qsos/apps/tpl-xuleditor/chrome/content/Template.js  Mon May  8 21:08:56 2006
@@ -140,7 +140,7 @@
         //var result = outputStream.write( xml, xml.length );
         outputStream.close();
     }
-    
+
     //Load and parse a remote QSOS XML file
     //ex: loadremote("http://localhost/qedit/xul/kolab.qsos";)
     //initializes local variable: sheet
@@ -151,7 +151,7 @@
         req.send(null);
         sheet = req.responseXML;
     }
-    
+
     //Show the XML DOM structure in a dialogbox
     function dump() {
         var serializer = new XMLSerializer();
@@ -429,7 +429,7 @@
     //  <score></score>
     //  <comment></comment>
     //</element>
-    function createElementScore(name, title, vardesc0, vardesc1, vardesc2) {
+    function createElementScore(name, title, vardesc, vardesc0, vardesc1, 
vardesc2) {
        if (fetchNode(name) != "false") {
                return "Error: a "+name+" node already exists.";
        }
@@ -437,6 +437,10 @@
                var element = sheet.createElement("element");
                element.setAttribute("name", name);
                element.setAttribute("title", title);
+
+               var desc = sheet.createElement("desc");
+               desc.appendChild(sheet.createTextNode(vardesc));
+               element.appendChild(desc);
        
                var desc0 = sheet.createElement("desc0");
                desc0.appendChild(sheet.createTextNode(vardesc0));
@@ -509,15 +513,15 @@
     //Returns the type of a node
     //"section", "score" or "info" 
     function getNodeType(name) {
-        var nodes = sheet.evaluate("//address@hidden'"+name+"']/desc", sheet, 
null, XPathResult.ANY_TYPE,null);
-        var node = nodes.iterateNext();
+        var node = sheet.evaluate("//address@hidden'"+name+"']/score", sheet, 
null, XPathResult.ANY_TYPE,null).iterateNext();
         if (node) {
+               return "score";
+       }
+       else {
+               node = sheet.evaluate("//address@hidden'"+name+"']/desc", 
sheet, null, XPathResult.ANY_TYPE,null).iterateNext();
                if (node.parentNode.nodeName == "section") return "section";
                else return "info";
        }
-        else {
-                return "score";
-       }
     }
 
     //Sets/Changes the type of an element node
@@ -556,11 +560,13 @@
                        element.removeChild(element.firstChild);
                }
                //Creates score tag
+               var desc = sheet.createElement("desc");
                var desc0 = sheet.createElement("desc0");
                var desc1 = sheet.createElement("desc1");
                var desc2 = sheet.createElement("desc2");
                var score = sheet.createElement("score");
                var comment = sheet.createElement("comment");
+               element.appendChild(desc);
                element.appendChild(desc0);
                element.appendChild(desc1);
                element.appendChild(desc2);
Index: qsos/apps/tpl-xuleditor/chrome/content/editor.js
diff -u qsos/apps/tpl-xuleditor/chrome/content/editor.js:1.5 
qsos/apps/tpl-xuleditor/chrome/content/editor.js:1.6
--- qsos/apps/tpl-xuleditor/chrome/content/editor.js:1.5        Thu Apr 20 
11:47:48 2006
+++ qsos/apps/tpl-xuleditor/chrome/content/editor.js    Mon May  8 21:08:56 2006
@@ -1,7 +1,7 @@
 /*
-**  Copyright (C) 2006 Atos Origin 
+**  Copyright (C) 2006 Atos Origin
 **
-**  Author: Raphaël Semeteys <address@hidden>
+**  Author: Raphaël Semeteys <address@hidden>
 **
 **  This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@
 **
 ** TODO:
 **     - Load remote QSOS XML file
+**     - Write a XMLSerializer to manage identation and generate <tag></tag> 
rather than <tag/>
 */
 
 //Object "Document" representing data in the QSOS XML file
@@ -403,14 +404,15 @@
                        break;
                case "score":
                        document.getElementById("f-c-type").selectedIndex = 1;
+                       freezeDesc("");
                        freezeScores("");
                        freezeTitle("");
                        document.getElementById("f-c-name").value = "UID: "+id;
                        document.getElementById("f-c-title").value = 
myDoc.getkeytitle(id);
+                       document.getElementById("f-c-desc").value = 
myDoc.getkeydesc(id);
                        document.getElementById("f-c-score0").value = 
myDoc.getkeydesc0(id);
                        document.getElementById("f-c-score1").value = 
myDoc.getkeydesc1(id);
                        document.getElementById("f-c-score2").value = 
myDoc.getkeydesc2(id);
-                       freezeDesc("true");
                        break;
        }
 }
@@ -470,12 +472,12 @@
        docChanged = "true";
        switch (type) {
                case "desc":
+                       document.getElementById("f-c-desc").value = "";
                        freezeScores("true");
                        myDoc.setElementDesc(id);
-                       freezeDesc("");
                        break;
                case "score":
-                       freezeDesc("true");
+                       document.getElementById("f-c-desc").value = "";
                        myDoc.setElementScore(id);
                        freezeScores("");
                        break;
@@ -621,7 +623,7 @@
 //Callback function of the newdesc.xul dialog window
 function newScore(values) {
        //Creates new Score element
-       var criterion = myDoc.createElementScore(values.name, values.title, 
values.desc0, values.desc1, values.desc2);
+       var criterion = myDoc.createElementScore(values.name, values.title, 
values.desc, values.desc0, values.desc1, values.desc2);
        myDoc.insertSubelement(criterion, id);
 
        //Creates new tree entry
Index: qsos/apps/tpl-xuleditor/chrome/content/newscore.xul
diff -u qsos/apps/tpl-xuleditor/chrome/content/newscore.xul:1.2 
qsos/apps/tpl-xuleditor/chrome/content/newscore.xul:1.3
--- qsos/apps/tpl-xuleditor/chrome/content/newscore.xul:1.2     Tue Apr 18 
16:43:34 2006
+++ qsos/apps/tpl-xuleditor/chrome/content/newscore.xul Mon May  8 21:08:56 2006
@@ -24,6 +24,7 @@
                var fields = new Object();
                fields.name = document.getElementById("d-c-name").value;
                fields.title = document.getElementById("d-c-title").value;
+               fields.desc = document.getElementById("d-c-desc").value;
                fields.desc0 = document.getElementById("d-c-desc0").value;
                fields.desc1 = document.getElementById("d-c-desc1").value;
                fields.desc2 = document.getElementById("d-c-desc2").value;
@@ -43,6 +44,9 @@
        
        <label control="d-c-title" value="Title "/>
        <textbox id="d-c-title"/>
+
+       <label control="d-c-desc" value="General description: "/>
+       <textbox id="d-c-desc" multiline="true"/>
        
        <label control="d-c-desc0" value="Score 0 description: "/>
        <textbox id="d-c-desc0" multiline="true"/>