nordic-dev.net/PAMGuard
nordic-dev.net/PAMGuard
2
0
Fork 0
mirror of https://github.com/PAMGuard/PAMGuard.git synced 2025-04-29 03:27:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update DBXMLQueries.java

Browse Source 
Small fix to XML to ensure drilling right down to correct element.
This commit is contained in:
Douglas Gillespie 2025-02-11 21:26:32 +00:00
parent a213762e4e
commit 4d23dda54c
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/tethys/dbxml/DBXMLQueries.java
View File

@ -241,22 +241,9 @@ public class DBXMLQueries {
String id = null; String id = null;
NodeList kids = aNode.getChildNodes(); NodeList kids = aNode.getChildNodes();
int nKids = kids.getLength(); int nKids = kids.getLength();
// System.out.printf("Node %d is type %d\n", i, aNode.getNodeType());
// String nodeName = aNode.getNodeName();
// nameStr = aNode.getTextContent();
// nameStr = nameStr.replaceFirst(toStrip, "");
// if (nameStr.length() > 60 && collection == Collection.Calibrations) {
// System.out.println("Long name: " + nameStr);
// }
// id = aNode.get
if (aNode instanceof Element) { if (aNode instanceof Element) {
Element el = (Element) aNode; Element el = (Element) aNode;
// nameStr = el.getLocalName();
// nameStr = el.getNodeName(); // gets doc
// nameStr = el.getNodeValue(); // gets null
// nameStr = el.getTagName(); // gets doc
// nameStr = el.getTextContent(); // gets concatenation of everything
// nameStr = el.get
NodeList ids = el.getElementsByTagName("Id"); NodeList ids = el.getElementsByTagName("Id");
if (ids.getLength() > 0) { if (ids.getLength() > 0) {
Node idEl = ids.item(0); Node idEl = ids.item(0);
@ -265,7 +252,7 @@ public class DBXMLQueries {
} }
/** /**
* For some reason, this is now getting four kid nodes when * For some reason, this is now getting 3 or 4 kid nodes when
* really there should only be two and as a result it's getting * really there should only be two and as a result it's getting
* the #text one twice, the second of which was empty, so * the #text one twice, the second of which was empty, so
* was overwriting the correct data * was overwriting the correct data
@ -291,12 +278,11 @@ public class DBXMLQueries {
} }
break; break;
default: default:
System.out.printf("Uknonwn node in Collection list %s item %d, Node %d name %s content %s\n", // System.out.printf("Uknonwn node in Collection list %s item %d, Node %d name %s content %s\n",
collection, i, k, name, cont); // collection, i, k, name, cont);
} }
} }
nameStr = nameStr.replaceFirst(toStrip, ""); nameStr = nameStr.replaceFirst(toStrip, "");
id = PamUtils.trimString(id);
/** /**
* Put in a bit fat bodge to see if the xml has concattenated * Put in a bit fat bodge to see if the xml has concattenated
* the name and id values into a stupid long name ... * the name and id values into a stupid long name ...
@ -617,7 +603,18 @@ public class DBXMLQueries {
// } // }
for (int i = 0; i < returns.getLength(); i++) { for (int i = 0; i < returns.getLength(); i++) {
Node aNode = returns.item(i); Node aNode = returns.item(i);
String docName = aNode.getTextContent(); String docName = null;
if (aNode instanceof Element) {
Element el = (Element) aNode;
NodeList ids = el.getElementsByTagName("Id");
if (ids.getLength() > 0) {
Node idNode = ids.item(0);
docName = idNode.getTextContent();
}
}
if (docName == null) {
docName = PamUtils.trimString(aNode.getTextContent());
}
detectionsNames.add(docName); detectionsNames.add(docName);
} }
return detectionsNames; return detectionsNames;
@ -674,7 +671,7 @@ public class DBXMLQueries {
// } // }
for (int i = 0; i < returns.getLength(); i++) { for (int i = 0; i < returns.getLength(); i++) {
Node aNode = returns.item(i); Node aNode = returns.item(i);
String docName = aNode.getTextContent(); String docName = PamUtils.trimString(aNode.getTextContent());
detectionsNames.add(docName); detectionsNames.add(docName);
} }
return detectionsNames; return detectionsNames;