Skip to content

W
web-ui
Commit 3d38cbf0 by Leonard Ambros II
Options

bug fix on checking XML

parent deae6ebf
Showing with 16 additions and 39 deletions
WebGde/WebContent/WebGde-Widgets/BPO/getElement.js
......@@ -78,7 +78,6 @@ export class BPO {
//processing all assigned workload first
if(elements){
<<<<<<< WebGde/WebContent/WebGde-Widgets/BPO/getElement.js
for (const element of elements) {
console.log("Checking element : " + element.elementId);
console.log("Element status : " + element.status);
......@@ -94,10 +93,10 @@ if(elements){
const xml = await this.isXMLExisting(retElement.element);
console.log(xml);
if (xml.isExisting) {
const xmlString = await xml.data.join('').replace('\t', '');
const lastImage = this.getXmlLastImage(xmlString);
console.log("lastImage " + lastImage);
// if (xml.isExisting) {
// const xmlString = await xml.data.join('').replace('\t', '');
// const lastImage = this.getXmlLastImage(xmlString);
// console.log("lastImage " + lastImage);
let dir = await lst.data;
// if(lastImage){
......@@ -115,37 +114,15 @@ if(elements){
sessionStorage.setItem("element_id", retElement.element.elementId);
sessionStorage.setItem("element_file_loc", retElement.element.fileLocation);
return true;
} else {
console.log("XML does not exist");
await this.returnElement(retElement.element.elementId);
}
=======
if (lst.isExisting) {
const xml = await this.isXMLExisting(retElement.element);
if (xml.isExisting) {
const xmlString = await xml.data.join('').replace('\t', '');
const lastImage = this.getXmlLastImage(xmlString);
//console.log("lastImage " + lastImage);
let dir = await lst.data;
// if(lastImage){
// const index = dir.indexOf(lastImage);
// console.log(index);
// if (index > -1) { // only splice array when item is found
// dir.splice(0, index +1); // 2nd parameter means remove one item only
// }
// if(dir.length === 0){
// continue;
// }
// } else {
// console.log("XML does not exist");
// await this.returnElement(retElement.element.elementId);
// }
sessionStorage.setItem("dir_files", JSON.stringify(dir));
sessionStorage.setItem("element_id", retElement.element.elementId);
sessionStorage.setItem("element_file_loc", retElement.element.fileLocation);
return true;
>>>>>>> WebGde/WebContent/WebGde-Widgets/BPO/getElement.js
} else {
// await this.returnElement(retElement.element.elementId);
await this.transferElement(element.elementId);
......
WebGde/WebContent/WebGde-Widgets/config.js
......@@ -38,14 +38,14 @@ export const HIGH_LIGHT_SCHEMA = "./WebGde-Widgets/sample_schema/dbSchema_anno.
export const ROOT_FOLDER = "/WebGde-Widgets";
//this determines if the images will be retrieved from the gfs
export const DOMAIN = "http://54.175.1.206:8080"
export const DOMAIN = "http://44.201.248.43:8080"
export const CONTEXTROOT = "gfs-explorer-ws"
// export const GFS_URL = "http://54.174.197.197:8080" + "/WebGde/svc/gfs-rest"
export const GFS_URL = "http://54.175.1.206:8080" + "/WebGdeDev/svc/gfs-rest"
export const GFS_URL = "http://44.201.248.43:8080" + "/WebGdeDev/svc/gfs-rest"
export const FOLDER_URL = DOMAIN + "/" + CONTEXTROOT + "/svc/gfs-rest/get-folder?parentPath=/Users/"
export const DOWNLOAD_URL = DOMAIN + "/" + CONTEXTROOT + "/svc/gfs-rest/get-download-link"
export const IS_RETRIEVE_FROM_GFS = "N"
export const LOCAL_URL = "http://54.175.1.206:8080" + "/WebGdeDev/svc/gfs-rest"
export const LOCAL_URL = "http://44.201.248.43:8080" + "/WebGdeDev/svc/gfs-rest"
export const INVALID_KEYS = "F1,F2,F3,F4,F5,F6,F7,F8,F9,F10,F11,F12,PrintScreen,ScrollLock,Pause,PageUp,PageDown,Insert,Delete,Control"
......@@ -53,7 +53,7 @@ export const INVALID_KEYS = "F1,F2,F3,F4,F5,F6,F7,F8,F9,F10,F11,F12,PrintScreen
export const IS_RETRIEVE_FROM_BPO = "Y"
// export const BPO_URL = "http://35.171.20.94:8080/bpo-sqa/"
// export const CURRENT_NODE = "Web GDE"
export const BPO_URL = "http://54.175.1.206:8080/bpo/"
export const BPO_URL = "http://44.201.248.43:8080/bpo/"
export const CURRENT_NODE = "Web_GDE_DEV"
export const ENCODING_PASS = "PASS1"
export const NEXT_NODE = "Complete"
......
web-ui @ 017fc068
Subproject commit e1d2656666fdf55c508e2a29ee82d5b903a861ac
Subproject commit 017fc0681026200533b1e61c0c015670c8ec2170
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment