From 47253bb217fe22bfe230a08361584dc6159fb7a8 Mon Sep 17 00:00:00 2001 From: Lucio Lelii Date: Fri, 9 Jan 2009 16:41:20 +0000 Subject: [PATCH] git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/vre-management/VREModeler@8195 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../vremodeler/impl/util/XMLUtil.java | 40 ++++++++++--------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/src/org/gcube/vremanagement/vremodeler/impl/util/XMLUtil.java b/src/org/gcube/vremanagement/vremodeler/impl/util/XMLUtil.java index e58b5a0..ac8bc76 100644 --- a/src/org/gcube/vremanagement/vremodeler/impl/util/XMLUtil.java +++ b/src/org/gcube/vremanagement/vremodeler/impl/util/XMLUtil.java @@ -143,7 +143,7 @@ public class XMLUtil { logger.error("Error creating XML Message"); e1.printStackTrace(); } - Hashtable> MDFHash= new Hashtable>(); + Hashtable>> MDFHash= new Hashtable>>(); Element mflEl= doc.createElement("MFL"); ArrayList tempArray; @@ -184,11 +184,11 @@ public class XMLUtil { }); } //logger.debug("MDFProva: "+keyTemp+" "+temp); - if(MDFHash.contains(tmpKeyEl)) MDFHash.get(tmpKeyEl).add(tmpEl); + if(MDFHash.contains(resNative.getString(1))) MDFHash.get(resNative.getString(1)).second.add(tmpEl); else{ tempArray=new ArrayList(); tempArray.add(tmpEl); - MDFHash.put(tmpKeyEl, tempArray ); + MDFHash.put(resNative.getString(1), new Couple>(tmpKeyEl, tempArray) ); } //logger.debug("MDFProva: Native "+MDFHash.get(keyTemp).size()); } @@ -217,11 +217,11 @@ public class XMLUtil { }); } //logger.debug("MDFProva: Derivable "+keyTemp+" "+temp); - if(MDFHash.contains(tmpKeyEl)) MDFHash.get(tmpKeyEl).add(tmpEl); + if(MDFHash.contains(resNative.getString(1))) MDFHash.get(resNative.getString(1)).second.add(tmpEl); else{ tempArray=new ArrayList(); tempArray.add(tmpEl); - MDFHash.put(tmpKeyEl, tempArray ); + MDFHash.put(resNative.getString(1), new Couple>(tmpKeyEl, tempArray) ); } } @@ -232,15 +232,15 @@ public class XMLUtil { } Element collectionListEl= doc.createElement("CollectionList"); - Element key; - Enumeration k=MDFHash.keys(); + String key; + Enumeration k=MDFHash.keys(); while (k.hasMoreElements()){ key= k.nextElement(); - ArrayList tempMD=MDFHash.get(key); + Couple> tempMD=MDFHash.get(key); //logger.debug("ArrayProva"+tempMD.size()); - collectionListEl.appendChild(addElements(doc, "Collection", new Element[]{ - key, addElements(doc, "MetadataFormatList", tempMD.toArray(new Element[0])) - })); + + tempMD.first.appendChild(addElements(doc, "MetadataFormatList", tempMD.second.toArray(new Element[0]))); + collectionListEl.appendChild(tempMD.first); } doc.appendChild(addElements(doc, "ResultSet", new Element[]{mflEl, collectionListEl})); @@ -293,23 +293,22 @@ public class XMLUtil { logger.error("Error creating XML Message"); e1.printStackTrace(); } - Element root= doc.createElement("ResultSet"); + Element root= doc.createElement("Resultset"); try { while(res.next()){ - Element functionalityEl= createTextElement(doc, "Functionality", null, new Couple("id", res.getInt(1)+""), new Couple("name", res.getString(2)), - new Couple("enableCS", res.getInt(1)==10 ? "true" : "false"), + new Couple("enableCS", res.getInt(1)==10 ? "true": "false"), new Couple("selected", selectedFunct.contains(res.getInt(1)) ? "true" : "false") - ); + ); + functionalityEl.appendChild(createTextElement(doc, "FunctionalityDescription", res.getString(3))); ResultSet subFunctRes=DBInterface.queryDB("select * from FUNCTIONALITY where father='"+res.getInt(1)+"';"); while(subFunctRes.next()){ Element subFunctEl=createTextElement(doc,"Functionality" , null, new Couple("id", subFunctRes.getInt(1)+""), new Couple("name", subFunctRes.getString(2)), - new Couple("enableCS", subFunctRes.getInt(1)==10 ? "true" : "false"), new Couple("selected", selectedFunct.contains(subFunctRes.getInt(1)) ? "true" : "false")); subFunctEl.appendChild(createTextElement(doc, "FunctionalityDescription", subFunctRes.getString(3))); @@ -359,6 +358,7 @@ public class XMLUtil { if (res.next()){ root= addElements(doc, "Resultset", new Element[]{ + createTextElement(doc, "Name",res.getString(1)), createTextElement(doc, "Description",res.getString(2)), createTextElement(doc, "VREDesigner",res.getString(3)), createTextElement(doc, "VREManager",res.getString(4)), @@ -368,6 +368,7 @@ public class XMLUtil { }else{ root= addElements(doc, "Resultset", new Element[]{ + createTextElement(doc, "Name",null), createTextElement(doc, "Description",null), createTextElement(doc, "VREDesigner",null), createTextElement(doc, "VREManager",null), @@ -426,6 +427,9 @@ public class XMLUtil { logger.error("transformation to String Error"); e.printStackTrace(); } + System.out.println("----------------------------------------------------------------------"); + System.out.println(temp); + System.out.println("----------------------------------------------------------------------"); return temp; } /** @@ -450,8 +454,8 @@ public class XMLUtil { * @param text the text to add at the element * @return the result element */ - public static Element createTextElement(Document doc, String Tag, String text, Couple ... attributes ){ - Element returnEl= doc.createElement("UpTime"); + public static Element createTextElement(Document doc, String tag, String text, Couple ... attributes ){ + Element returnEl= doc.createElement(tag); if (attributes!=null){ for (Couple attribute : attributes){ returnEl.setAttribute(attribute.first, attribute.second);