glycobook 0.1.0.alpha.27-java → 0.1.0.alpha.28-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6272e65de448b555e008b0cf21a3669e8f32a224f655767be5e1a1f1eb3ceeec
-  data.tar.gz: b2592c9d2276fe74935a3b7344540af16c97c08137d54129d0e340da0b17fcc3
+  metadata.gz: 0ab0fb823f5ea6b6b7bab5498ec7dacba8eb712eee803cfd42812b53e78c6e3b
+  data.tar.gz: 3b914b777654781379056d9a35c94278d2810c90db16553495632c4da6f21d8e
 SHA512:
-  metadata.gz: e35c8a97d6e542603d803810c03f67a7357fda07f14d8d62fc3d34fc0d0728b30431d39110db5e2dd68383e8f4c756be64821f79bf3160c1e27fd634a9b2d38d
-  data.tar.gz: a9bc9acdb39e2c8081e214339c66559f5c8cc14f35e0e3dd542df97342b8a4318e94acc67062d290c19158b59a183efef4b7abbc1357c1cf6155fe8a0831b410
+  metadata.gz: f6f8cd1f6966ff7b4410787203641aa756b5f31a63355329679530ed40f597e8a319dbf37f52d1f1442110e7e0938c437f576f7a552d971bc9fb50c1be97ce17
+  data.tar.gz: 2438c0d81e3e965937e4f48b3cd8d047f0dbdbeb052f83eaaa05edc5abda3bb07a36b10e69eba3c796fd0e3c6128c73e36755a00db74d663c7f407727be74b35

data/jar.yml

@@ -24,6 +24,24 @@ libraries:
     url: "https://gitlab.com/glycoinfo/wurcsframework/-/package_files/87428121/download"
     file: "jar/wurcsframework-1.2.14.jar"
 
+  - name: wurcsframework-1.2.15
+    info: "https://gitlab.com/glycoinfo/wurcsframework"
+    version: 1.2.15
+    url: "https://gitlab.com/glycoinfo/wurcsframework/-/package_files/110116881/download"
+    file: "jar/wurcsframework-1.2.15.jar"
+
+  - name: wurcsframework-1.2.16
+    info: "https://gitlab.com/glycoinfo/wurcsframework"
+    version: 1.2.16
+    url: "https://gitlab.com/glycoinfo/wurcsframework/-/package_files/119628420/download"
+    file: "jar/wurcsframework-1.2.16.jar"
+
+  - name: wurcsframework-1.3.0
+    info: "https://gitlab.com/glycoinfo/wurcsframework"
+    version: 1.3.0
+    url: "https://gitlab.com/glycoinfo/wurcsframework/-/package_files/125589992/download"
+    file: "jar/wurcsframework-1.3.0.jar"
+
   - name: wurcsframework-1.3.1
     info: "https://gitlab.com/glycoinfo/wurcsframework"
     version: 1.3.1

data/lib/wurcsverify.rb

@@ -10,11 +10,24 @@ java_import 'java.net.URLClassLoader'
 java_import 'org.slf4j.Logger'
 
 class WurcsVerify
+
+  @@gtc_version = "1.2.14"
+  @@v1215 = "1.2.15"
+  @@v1216 = "1.2.16"
+  @@v130 = "1.3.0"
+  @@v131 = "1.3.1"
+
   def initialize
-      @wfw_glytoucan_loader = self.create_custom_classloader("jar/wurcsframework-1.2.14.jar")
-      @wfw_131_loader = self.create_custom_classloader("jar/wurcsframework-1.3.1.jar")
+      @wfw_glytoucan_loader = self.create_custom_classloader("jar/wurcsframework-" + @@gtc_version + ".jar")
+      @wfw_v131_loader = self.create_custom_classloader("jar/wurcsframework-" + @@v131 + ".jar")
+      @wfw_v130_loader = self.create_custom_classloader("jar/wurcsframework-" + @@v130 + ".jar")
+      @wfw_v1216_loader = self.create_custom_classloader("jar/wurcsframework-" + @@v1216 + ".jar")
+      @wfw_v1215_loader = self.create_custom_classloader("jar/wurcsframework-" + @@v1215 + ".jar")
       @validator_glytoucan = java.lang.Class.forName("org.glycoinfo.WURCSFramework.util.validation.WURCSValidator",true,@wfw_glytoucan_loader)
-      @validator_131 = java.lang.Class.forName("org.glycoinfo.WURCSFramework.util.validation.WURCSValidator", true, @wfw_131_loader)
+      @validator_v131 = java.lang.Class.forName("org.glycoinfo.WURCSFramework.util.validation.WURCSValidator", true, @wfw_v131_loader)
+      @validator_v130 = java.lang.Class.forName("org.glycoinfo.WURCSFramework.util.validation.WURCSValidator", true, @wfw_v130_loader)
+      @validator_v1216 = java.lang.Class.forName("org.glycoinfo.WURCSFramework.util.validation.WURCSValidator", true, @wfw_v1216_loader)
+      @validator_v1215 = java.lang.Class.forName("org.glycoinfo.WURCSFramework.util.validation.WURCSValidator", true, @wfw_v1215_loader)
   end
 
   def create_custom_classloader(jar_path)
@@ -23,34 +36,60 @@ class WurcsVerify
     URLClassLoader.newInstance([url].to_java(URL), java.lang.Thread.currentThread.getContextClassLoader)
   end
 
-  def validatorVerify(w)
+  def validatorVerify(w,style)
     v_glytoucan = @validator_glytoucan.new_instance
     v_glytoucan.start(w)
 
-    v_131 = @validator_131.new_instance
+    v_131 = @validator_v131.new_instance
     v_131.start(w)
 
-    ret = {"1.2.14" => self.dovalidator(v_glytoucan),
-            "1.3.1" => self.dovalidator131(v_131) }
+    v_130 = @validator_v130.new_instance
+    v_130.start(w)
+
+    v_1216 = @validator_v1216.new_instance
+    v_1216.start(w)
+
+    v_1215 = @validator_v1215.new_instance
+    v_1215.start(w)
+
+    if (style == "v3")
+      ret = {@@gtc_version => self.dovalidatorv3(v_glytoucan,@@gtc_version),
+        @@v131  => self.dovalidatorv3(v_131, @@v131),
+        @@v130  => self.dovalidatorv3(v_130, @@v130),
+        @@v1215 => self.dovalidatorv3(v_1215, @@v1215),
+        @@v1216 => self.dovalidatorv3(v_1216, @@v1216)
+      }
+    elsif (style == "wfw")
+      ret = {@@gtc_version => self.dovalidator(v_glytoucan,@@gtc_version),
+      @@v131  => self.dovalidator(v_131, @@v131),
+      @@v130  => self.dovalidator(v_130, @@v130),
+      @@v1215 => self.dovalidator(v_1215, @@v1215),
+      @@v1216 => self.dovalidator(v_1216, @@v1216)
+      }
+    else
+      pp "strange second paramerters"
+    end
     return ret
   end
 
-  def dovalidator(validator)
-    reports = { "VALIDATOR" => ["WURCSFramework-1.2.14"],
+  def dovalidatorv3(validator,version)
+    if validator.getReport().respond_to?(:isStandardized)
+      flag = validator.getReport().isStandardized()
+    else
+      flag = "undef"
+    end
+    reports = { "VALIDATOR" => ["WURCSFramework-" + version],
                 "WARNING" => validator.getReport().hasWarning(),
+
+                "FLAG" => flag,
                 "ERROR" => validator.getReport().hasError(),
                 "UNVERIFIABLE" => validator.getReport().hasUnverifiable() }
     return {"message" => reports,
             "StandardWURCS" => validator.getReport().standard_string(),
             "RESULTS" => validator.getReport().getResults() }
   end
-  def dovalidator131(validator)
-    reports = { "VALIDATOR" => ["WURCSFramework-1.3.1"],
-                "WARNING" => validator.getReport().hasWarning(),
-                "ERROR" => validator.getReport().hasError(),
-                "UNVERIFIABLE" => false }
-    return {"message" => reports,
-            "StandardWURCS" => validator.getReport().standard_string(),
-            "RESULTS" => validator.getReport().getResults() }
+  def dovalidator(validator,version)
+    return {"VALIDATOR" => ["WURCSFramework-" + version],
+            "Report" => validator.getReport().getResults()}
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glycobook
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha.27
+  version: 0.1.0.alpha.28
 platform: java
 authors:
 - Akihiro Fujita
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-13 00:00:00.000000000 Z
+date: 2024-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement