[erp5_web_monitoring] http_storage and parser_storage is now merged with jio script

bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_jio_html.html

@@ -12,8 +12,6 @@
     <script src="jiodev.js" type="text/javascript"></script>
     <script src="monitoring_jio_storage.js" type="text/javascript"></script>
     <script src="monitoring_jio_web_storage.js" type="text/javascript"></script>
-    <script src="monitoring_jio_parser_storage.js" type="text/javascript"></script>
-    <script src="monitoring_jio_http_storage.js" type="text/javascript"></script>
 
     <!-- custom script -->
     <script src="gadget_officejs_monitoring_jio.js" type="text/javascript"></script>

bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_jio_html.xml

@@ -237,7 +237,7 @@
             </item>
             <item>
                 <key> <string>serial</string> </key>
-                <value> <string>962.48734.17927.8823</string> </value>
+                <value> <string>963.22427.36654.49664</string> </value>
             </item>
             <item>
                 <key> <string>state</string> </key>
@@ -255,7 +255,7 @@
                     </tuple>
                     <state>
                       <tuple>
-                        <float>1507898792.09</float>
+                        <float>1510320135.91</float>
                         <string>UTC</string>
                       </tuple>
                     </state>

bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/monitoring_jio_http_storage_js.js

-/*global RSVP, Blob*/
-/*jslint nomen: true*/
-(function (jIO, RSVP, Blob) {
-  "use strict";
-
-  function HttpStorage(spec) {
-    if (spec.hasOwnProperty('catch_error')) {
-      this._catch_error = spec.catch_error;
-    } else {
-      this._catch_error = false;
-    }
-  }
-
-  HttpStorage.prototype.get = function (id) {
-    var context = this;
-    return new RSVP.Queue()
-      .push(function () {
-        return jIO.util.ajax({
-          type: 'HEAD',
-          url: id
-        });
-      })
-      .push(undefined, function (error) {
-        if (context._catch_error) {
-          return error;
-        }
-        if ((error.target !== undefined) &&
-            (error.target.status === 404)) {
-          throw new jIO.util.jIOError("Cannot find url " + id, 404);
-        }
-        throw error;
-      })
-      .push(function (response) {
-
-        var key_list = ["Content-Disposition", "Content-Type", "Date",
-                        "Last-Modified", "Vary", "Cache-Control", "Etag",
-                        "Accept-Ranges", "Content-Range"],
-          i,
-          key,
-          value,
-          result = {};
-        result.Status = response.target.status;
-        for (i = 0; i < key_list.length; i += 1) {
-          key = key_list[i];
-          value = response.target.getResponseHeader(key);
-          if (value !== null) {
-            result[key] = value;
-          }
-        }
-        return result;
-      });
-  };
-
-  HttpStorage.prototype.allAttachments = function () {
-    return {enclosure: {}};
-  };
-
-  HttpStorage.prototype.getAttachment = function (id, name) {
-    var context = this;
-    if (name !== 'enclosure') {
-      throw new jIO.util.jIOError("Forbidden attachment: "
-                                  + id + " , " + name,
-                                  400);
-    }
-    return new RSVP.Queue()
-      .push(function () {
-        return jIO.util.ajax({
-          type: 'GET',
-          url: id,
-          dataType: "blob"
-        });
-      })
-      .push(undefined, function (error) {
-        if (context._catch_error) {
-          return error;
-        }
-        if ((error.target !== undefined) &&
-            (error.target.status === 404)) {
-          throw new jIO.util.jIOError("Cannot find url " + id, 404);
-        }
-        throw error;
-      })
-      .push(function (response) {
-        return new Blob(
-          [response.target.response || response.target.responseText],
-          {"type": response.target.getResponseHeader('Content-Type') ||
-                   "application/octet-stream"}
-        );
-      });
-  };
-
-  jIO.addStorage('http', HttpStorage);
-
-}(jIO, RSVP, Blob));
\ No newline at end of file

bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/monitoring_jio_parser_storage_js.js

-/*jslint nomen: true*/
-/*global jIO, DOMParser */
-(function (jIO, DOMParser) {
-  "use strict";
-
-  /////////////////////////////////////////////////////////////
-  // OPML Parser
-  /////////////////////////////////////////////////////////////
-  function OPMLParser(txt) {
-    this._dom_parser = new DOMParser().parseFromString(txt, 'text/xml');
-  }
-
-  OPMLParser.prototype.parseHead = function () {
-    // fetch all children instead
-    var channel_element = this._dom_parser.querySelector("opml > head"),
-      tag_element,
-      i,
-      result = {};
-
-    for (i = channel_element.childNodes.length - 1; i >= 0; i -= 1) {
-      tag_element = channel_element.childNodes[i];
-      result[tag_element.tagName] = tag_element.textContent;
-    }
-    return result;
-  };
-
-  OPMLParser.prototype.parseOutline = function (result_list, outline_element,
-                                                prefix, include, id) {
-    var attribute,
-      i,
-      child,
-      result = {};
-
-    if ((id === prefix) || (id === undefined)) {
-      result_list.push({
-        id: prefix,
-        value: {}
-      });
-      if (include) {
-        for (i = outline_element.attributes.length - 1; i >= 0; i -= 1) {
-          attribute = outline_element.attributes[i];
-          if (attribute.value) {
-            result[attribute.name] = attribute.value;
-          }
-        }
-        result_list[result_list.length - 1].doc = result;
-      }
-    }
-
-    for (i = outline_element.childNodes.length - 1; i >= 0; i -= 1) {
-      child = outline_element.childNodes[i];
-      if (child.tagName === 'outline') {
-        this.parseOutline(result_list, child, prefix + '/' + i, include, id);
-      }
-    }
-  };
-
-  OPMLParser.prototype.getDocumentList = function (include, id) {
-    var result_list,
-      item_list = this._dom_parser.querySelectorAll("body > outline"),
-      i;
-
-    if ((id === '/0') || (id === undefined)) {
-      result_list = [{
-        id: '/0',
-        value: {}
-      }];
-      if (include) {
-        result_list[0].doc = this.parseHead();
-      }
-    } else {
-      result_list = [];
-    }
-
-    for (i = 0; i < item_list.length; i += 1) {
-      this.parseOutline(result_list, item_list[i], '/1/' + i, include, id);
-    }
-    return result_list;
-  };
-
-  /////////////////////////////////////////////////////////////
-  // RSS Parser
-  /////////////////////////////////////////////////////////////
-  function RSSParser(txt) {
-    this._dom_parser = new DOMParser().parseFromString(txt, 'text/xml');
-  }
-
-  RSSParser.prototype.parseElement = function (element) {
-    var tag_element,
-      i,
-      j,
-      attribute,
-      result = {};
-
-    for (i = element.childNodes.length - 1; i >= 0; i -= 1) {
-      tag_element = element.childNodes[i];
-      if (tag_element.tagName !== 'item') {
-        result[tag_element.tagName] = tag_element.textContent;
-
-        for (j = tag_element.attributes.length - 1; j >= 0; j -= 1) {
-          attribute = tag_element.attributes[j];
-          if (attribute.value) {
-            result[tag_element.tagName + '_' + attribute.name] =
-              attribute.value;
-          }
-        }
-      }
-    }
-    return result;
-  };
-
-  RSSParser.prototype.getDocumentList = function (include, id) {
-    var result_list,
-      item_list = this._dom_parser.querySelectorAll("rss > channel > item"),
-      i;
-
-    if ((id === '/0') || (id === undefined)) {
-      result_list = [{
-        id: '/0',
-        value: {}
-      }];
-      if (include) {
-        result_list[0].doc = this.parseElement(
-          this._dom_parser.querySelector("rss > channel")
-        );
-      }
-    } else {
-      result_list = [];
-    }
-
-    for (i = 0; i < item_list.length; i += 1) {
-      if ((id === '/0/' + i) || (id === undefined)) {
-        result_list.push({
-          id: '/0/' + i,
-          value: {}
-        });
-        if (include) {
-          result_list[result_list.length - 1].doc =
-            this.parseElement(item_list[i]);
-        }
-      }
-    }
-    return result_list;
-  };
-
-  /////////////////////////////////////////////////////////////
-  // Helpers
-  /////////////////////////////////////////////////////////////
-  var parser_dict = {
-    'rss': RSSParser,
-    'opml': OPMLParser
-  };
-
-  function getParser(storage) {
-    return storage._sub_storage.getAttachment(storage._document_id,
-                                              storage._attachment_id,
-                                              {format: 'text'})
-      .push(function (txt) {
-        return new parser_dict[storage._parser_name](txt);
-      });
-  }
-
-  /////////////////////////////////////////////////////////////
-  // Storage
-  /////////////////////////////////////////////////////////////
-  function ParserStorage(spec) {
-    this._attachment_id = spec.attachment_id;
-    this._document_id = spec.document_id;
-    this._parser_name = spec.parser;
-    this._sub_storage = jIO.createJIO(spec.sub_storage);
-  }
-
-  ParserStorage.prototype.hasCapacity = function (capacity) {
-    return (capacity === "list") || (capacity === 'include');
-  };
-
-  ParserStorage.prototype.buildQuery = function (options) {
-    if (options === undefined) {
-      options = {};
-    }
-    return getParser(this)
-      .push(function (parser) {
-        return parser.getDocumentList((options.include_docs || false));
-      });
-  };
-
-  ParserStorage.prototype.get = function (id) {
-    return getParser(this)
-      .push(function (parser) {
-        var result_list = parser.getDocumentList(true, id);
-        if (result_list.length) {
-          return result_list[0].doc;
-        }
-        throw new jIO.util.jIOError(
-          "Cannot find parsed document: " + id,
-          404
-        );
-      });
-  };
-
-  jIO.addStorage('parser', ParserStorage);
-
-}(jIO, DOMParser));
\ No newline at end of file

bt5/erp5_web_monitoring/bt/template_keep_last_workflow_history_only_path_list

@@ -9,8 +9,6 @@ web_page_module/gadget_officejs_jio_promise_view_html
 web_page_module/gadget_officejs_jio_promise_view_js
 web_page_module/gadget_officejs_monitoring_*
 web_page_module/jsen_json_validator_js
-web_page_module/monitoring_jio_http_storage_js
-web_page_module/monitoring_jio_parser_storage_js
 web_page_module/monitoring_jio_storage_js
 web_page_module/monitoring_jio_web_storage_js
 web_page_module/ojsm_gadget_erp5_statusfield_*

bt5/erp5_web_monitoring/bt/template_keep_workflow_path_list

@@ -9,8 +9,6 @@ web_page_module/gadget_officejs_jio_promise_view_html
 web_page_module/gadget_officejs_jio_promise_view_js
 web_page_module/gadget_officejs_monitoring_*
 web_page_module/jsen_json_validator_js
-web_page_module/monitoring_jio_http_storage_js
-web_page_module/monitoring_jio_parser_storage_js
 web_page_module/monitoring_jio_storage_js
 web_page_module/monitoring_jio_web_storage_js
 web_page_module/ojsm_gadget_erp5_statusfield_*

bt5/erp5_web_monitoring/bt/template_path_list

@@ -9,8 +9,6 @@ web_page_module/gadget_officejs_jio_promise_view_html
 web_page_module/gadget_officejs_jio_promise_view_js
 web_page_module/gadget_officejs_monitoring_*
 web_page_module/jsen_json_validator_js
-web_page_module/monitoring_jio_http_storage_js
-web_page_module/monitoring_jio_parser_storage_js
 web_page_module/monitoring_jio_storage_js
 web_page_module/monitoring_jio_web_storage_js
 web_page_module/ojsm_gadget_erp5_statusfield_*