return this.bluePrint;
}
- public List<Object> collectModuleRoots(XSQLBluePrintNode table) {
+ public List<Object> collectModuleRoots(XSQLBluePrintNode table,LogicalDatastoreType type) {
if (table.getParent().isModule()) {
try {
List<Object> result = new LinkedList<Object>();
.toInstance();
DOMDataReadTransaction t = this.domDataBroker
.newReadOnlyTransaction();
- Object node = t.read(LogicalDatastoreType.OPERATIONAL,
+ Object node = t.read(type,
instanceIdentifier).get();
+
node = XSQLODLUtils.get(node, "reference");
if (node == null) {
return result;
XSQLAdapter.log(err);
}
} else {
- return collectModuleRoots(table.getParent());
+ return collectModuleRoots(table.getParent(),type);
}
return null;
}
public void execute(JDBCResultSet rs) {
List<XSQLBluePrintNode> tables = rs.getTables();
- List<Object> roots = collectModuleRoots(tables.get(0));
+ List<Object> roots = collectModuleRoots(tables.get(0),LogicalDatastoreType.OPERATIONAL);
+ roots.addAll(collectModuleRoots(tables.get(0),LogicalDatastoreType.CONFIGURATION));
+ if(roots.isEmpty()){
+ rs.setFinished(true);
+ }
XSQLBluePrintNode main = rs.getMainTable();
List<NETask> tasks = new LinkedList<XSQLAdapter.NETask>();
}
- protected void processCommand(StringBuffer inputString, PrintStream sout,
- TelnetConnection tc) {
+ public void processCommand(StringBuffer inputString, PrintStream sout) {
if (inputString.toString().trim().equals("r")) {
sout.println(lastInputString);
inputString = lastInputString;
for (int i = 0; i < iNames.length; i++) {
sout.println(iNames[i]);
}
- } else if (input.startsWith("cd sid")) {
- String substr = input.substring("cd sid".length()).trim();
- for (NEEntry e : elements.values()) {
- if (((Module) e.ne).getName().equals(substr)) {
- tc.currentModule = (Module) e.ne;
- }
- }
- } else if (input.equals("list sid")) {
- String arr[] = new String[elements.size()];
-
- int i = 0;
- for (NEEntry entry : elements.values()) {
- arr[i] = entry.toString();
- i++;
- }
- Arrays.sort(arr);
- for (String s : arr) {
- sout.println(s);
- }
} else if (input.equals("help") || input.equals("?")) {
// sout.println(getLongDescription());
} else if (input.equals("avmdata")) {
out.print(prompt);
char c = 0;
byte data[] = new byte[1];
- while (c != '\n') {
+ while (!socket.isClosed() && socket.isConnected() && !socket.isInputShutdown() && c != '\n') {
try {
in.read(data);
c = (char) data[0];
inputString.append(c);
} catch (Exception err) {
err.printStackTrace(out);
+ stopped = true;
+ break;
}
}
- processCommand(inputString, out, this);
+ processCommand(inputString, out);
inputString = new StringBuffer();
}
} catch (Exception err) {