wirispluginengine 3.62.0.1322 → 7.14.0.1422

data/lib/com/wiris/plugin/impl/FolderTreeStorageAndCache.rb

@@ -1,144 +1,75 @@
 module WirisPlugin
 include  Wiris
-require('com/wiris/plugin/api/ConfigurationKeys.rb')
-require('com/wiris/util/sys/Store.rb')
-require('com/wiris/plugin/storage/StorageAndCache.rb')
-  class FolderTreeStorageAndCache
-  extend StorageAndCacheInterface
+    require('com/wiris/plugin/storage/StorageAndCache.rb')
+    require('com/wiris/plugin/impl/CacheImpl.rb')
+    require('com/wiris/plugin/storage/StorageAndCache.rb')
+    class FolderTreeStorageAndCache
+    extend StorageAndCacheInterface
 
-  include Wiris
+    include Wiris
 
-    attr_accessor :config
-  @@backwards_compat = true
-    def self.backwards_compat
-      @@backwards_compat
-    end
-    def self.backwards_compat=(backwards_compat)
-      @@backwards_compat = backwards_compat
-    end
-    def initialize()
-      super()
-    end
-    def init(obj,config)
-      @config = config
-    end
-    def codeDigest(content)
-      digest = Md5Tools::encodeString(content)
-      parent = getFolderStore(getAndCheckFolder(ConfigurationKeys::FORMULA_FOLDER),digest)
-      parent::mkdirs()
-      store = getFileStoreWithParent(parent,digest,"ini")
-      store::write(content)
-      return digest
-    end
-    def decodeDigest(digest)
-      formula = getAndCheckFolder(ConfigurationKeys::FORMULA_FOLDER)
-      store = getFileStore(formula,digest,"ini")
-      if @@backwards_compat
-        if !store::exists()
-          oldstore = Store::newStore(((formula+"/")+digest)+".ini")
-          parent = store::getParent()
-          parent::mkdirs()
-          oldstore::moveTo(store)
+        attr_accessor :config
+    @@backwards_compat;
+        def self.backwards_compat
+            @@backwards_compat
         end
-      end
-      return store::read()
-    end
-    def retreiveData(digest,service)
-      formula = getAndCheckFolder(ConfigurationKeys::CACHE_FOLDER)
-      store = getFileStore(formula,digest,getExtension(service))
-      if @@backwards_compat
-        if !store::exists()
-          oldstore = Store::newStore((((formula+"/")+digest)+".")+getExtension(service))
-          if !oldstore::exists()
-            return nil
-          end
-          parent = store::getParent()
-          parent::mkdirs()
-          oldstore::moveTo(store)
+        def self.backwards_compat=(backwards_compat)
+            @@backwards_compat = backwards_compat
         end
-      else 
-        if !store::exists()
-          return nil
+        attr_accessor :cache
+        attr_accessor :cacheFormula
+        def initialize()
+            super()
         end
-      end
-      return store::readBinary()::getData()
-    end
-    def storeData(digest,service,stream)
-      formula = getAndCheckFolder(ConfigurationKeys::CACHE_FOLDER)
-      parent = getFolderStore(formula,digest)
-      parent::mkdirs()
-      store = getFileStoreWithParent(parent,digest,getExtension(service))
-      store::writeBinary(Bytes::ofData(stream))
-    end
-    def getAndCheckFolder(key)
-      folder = PropertiesTools::getProperty(@config,key)
-      if (folder==nil)||(folder::trim()::length()==0)
-        raise Exception,"Missing configuration value: "+key
-      end
-      return folder
-    end
-    def getExtension(service)
-      if (service=="png")
-        return "png"
-      end
-      if (service=="svg")
-        return "svg"
-      end
-      return service+".txt"
-    end
-    def getFolderStore(dir,digest)
-      return Store::newStore((((dir+"/")+Std::substr(digest,0,2).to_s)+"/")+Std::substr(digest,2,2).to_s)
-    end
-    def getFileStoreWithParent(parent,digest,extension)
-      return Store::newStoreWithParent(parent,(Std::substr(digest,4).to_s+".")+extension)
-    end
-    def getFileStore(dir,digest,extension)
-      return getFileStoreWithParent(getFolderStore(dir,digest),digest,extension)
-    end
-    def updateFoldersStructure()
-      updateFolderStructure(getAndCheckFolder(ConfigurationKeys::CACHE_FOLDER))
-      updateFolderStructure(getAndCheckFolder(ConfigurationKeys::FORMULA_FOLDER))
-    end
-    def updateFolderStructure(dir)
-      folder = Store::newStore(dir)
-      files = folder::list()
-      if files!=nil
-          for i in 0..files::length-1
-            digest = isFormulaFileName(files[i])
-            if digest!=nil
-              newFolder = getFolderStore(dir,digest)
-              newFolder::mkdirs()
-              newFile = getFileStoreWithParent(newFolder,digest,Std::substr(files[i],files[i]::indexOf(".")+1))
-              file = Store::newStoreWithParent(folder,files[i])
-              file::moveTo(newFile)
+        def init(obj, config, cache, cacheFormula)
+            self.config = config
+            self.cache = cache
+            self.cacheFormula = cacheFormula
+        end
+        def codeDigest(content)
+            digest = Md5Tools::encodeString(content)
+            begin
+            self.cacheFormula::set(digest + ".ini",Bytes::ofData(Utf8::toBytes(content)))
             end
-            i+=1
-          end
-      end
-    end
-    def isFormulaFileName(name)
-      i = name::indexOf(".")
-      if i==-1
-        return nil
-      end
-      digest = Std::substr(name,0,i)
-      if digest::length()!=32
-        return nil
-      end
-      return digest
-    end
-    def deleteCache()
-      formulaFolder = getAndCheckFolder(ConfigurationKeys::FORMULA_FOLDER)
-      cacheFolder = getAndCheckFolder(ConfigurationKeys::CACHE_FOLDER)
-      includes = Array.new()
-      includes::push("png")
-      includes::push("csv")
-      includes::push("txt")
-      if !(PropertiesTools::getProperty(@config,ConfigurationKeys::SAVE_MODE,"xml")=="image")
-        includes::push("ini")
-      end
-      Store::deleteDirectory(formulaFolder,includes)
-      Store::deleteDirectory(cacheFolder,includes)
+            return digest
+        end
+        def decodeDigest(digest)
+            data = self.cacheFormula::get(digest + ".ini")
+            if data != nil
+                return Utf8::fromBytes(data::getData())
+            else 
+                return nil
+            end
+        end
+        def retreiveData(digest, service)
+            data = self.cache::get((digest + ".") + getExtension(service))
+            if data != nil
+                return data::getData()
+            else 
+                return nil
+            end
+        end
+        def storeData(digest, service, stream)
+            begin
+            self.cache::set((digest + ".") + self.getExtension(service),Bytes::ofData(stream))
+            end
+        end
+        def getExtension(service)
+            if (service == "png")
+                return "png"
+            end
+            if (service == "svg")
+                return "svg"
+            end
+            return service + ".txt"
+        end
+        def deleteCache()
+            cache = CacheImpl.new(self.config)
+            begin
+            cache::deleteAll()
+            end
+        end
+
+    @@backwards_compat = true
     end
-  end
 end

data/lib/com/wiris/plugin/impl/GenericParamsProviderImpl.rb

@@ -1,56 +1,58 @@
 module WirisPlugin
 include  Wiris
-require('com/wiris/plugin/api/ConfigurationKeys.rb')
-require('com/wiris/plugin/api/ParamsProvider.rb')
-  class GenericParamsProviderImpl
-  extend ParamsProviderInterface
+    require('com/wiris/plugin/api/ConfigurationKeys.rb')
+    require('com/wiris/plugin/api/ParamsProvider.rb')
+    require('com/wiris/plugin/api/ParamsProvider.rb')
+    class GenericParamsProviderImpl
+    extend ParamsProviderInterface
 
-  include Wiris
+    include Wiris
 
-    attr_accessor :properties
-    def initialize(properties)
-      super()
-      @properties = properties
-    end
-    def getParameter(param,dflt)
-      return PropertiesTools::getProperty(@properties,param,dflt)
-    end
-    def getRequiredParameter(param)
-      parameter = PropertiesTools::getProperty(@properties,param,nil)
-      if parameter!=nil
-        return parameter
-      else 
-        raise Exception,("Error: parameter"+param)+"is required"
-      end
-    end
-    def getParameters()
-      return @properties
-    end
-    def getRenderParameters(configuration)
-      renderParams = PropertiesTools::newProperties()
-      renderParameterList = configuration::getProperty(ConfigurationKeys::EDITOR_PARAMETERS_LIST,ConfigurationKeys::EDITOR_PARAMETERS_DEFAULT_LIST)::split(",")
-        for i in 0..renderParameterList::length-1
-          key = renderParameterList[i]
-          value = PropertiesTools::getProperty(@properties,key)
-          if value!=nil
-            PropertiesTools::setProperty(renderParams,key,value)
-          end
-          i+=1
+        attr_accessor :properties
+        def initialize(properties)
+            super()
+            self.properties = properties
         end
-      return renderParams
-    end
-    def getServiceParameters()
-      serviceParams = PropertiesTools::newProperties()
-      serviceParamListArray = Std::split(ConfigurationKeys::SERVICES_PARAMETERS_LIST,",")
-        for i in 0..serviceParamListArray::length()-1
-          key = serviceParamListArray::_(i)
-          value = PropertiesTools::getProperty(@properties,key)
-          if value!=nil
-            PropertiesTools::setProperty(serviceParams,key,value)
-          end
-          i+=1
+        def getParameter(param, dflt)
+            return PropertiesTools::getProperty(self.properties,param,dflt)
         end
-      return serviceParams
+        def getRequiredParameter(param)
+            parameter = PropertiesTools::getProperty(self.properties,param,nil)
+            if parameter != nil
+                return parameter
+            else 
+                raise Exception,("Error: parameter " + param) + " is required"
+            end
+        end
+        def getParameters()
+            return self.properties
+        end
+        def getRenderParameters(configuration)
+            renderParams = PropertiesTools::newProperties()
+            renderParameterList = configuration::getProperty(ConfigurationKeys::EDITOR_PARAMETERS_LIST,ConfigurationKeys::EDITOR_PARAMETERS_DEFAULT_LIST)::split(",")
+            for i in 0..renderParameterList::length - 1
+                key = renderParameterList[i]
+                value = PropertiesTools::getProperty(self.properties,key)
+                if value != nil
+                    PropertiesTools::setProperty(renderParams,key,value)
+                end
+                i+=1
+            end
+            return renderParams
+        end
+        def getServiceParameters()
+            serviceParams = PropertiesTools::newProperties()
+            serviceParamListArray = Std::split(ConfigurationKeys::SERVICES_PARAMETERS_LIST,",")
+            for i in 0..serviceParamListArray::length() - 1
+                key = serviceParamListArray::_(i)
+                value = PropertiesTools::getProperty(self.properties,key)
+                if value != nil
+                    PropertiesTools::setProperty(serviceParams,key,value)
+                end
+                i+=1
+            end
+            return serviceParams
+        end
+
     end
-  end
 end

data/lib/com/wiris/plugin/impl/HttpImpl.rb

@@ -1,53 +1,54 @@
 module WirisPlugin
 include  Wiris
-  class HttpImpl < Http
-  include Wiris
+    class HttpImpl < Http
+    include Wiris
+
+        attr_accessor :data
+        attr_accessor :listener
+        def initialize(url, listener)
+            super(url)
+            self.listener = listener
+        end
+        def request(post)
+            proxy = getProxy()
+            if ((proxy != nil) && (proxy::host != nil)) && (proxy::host::length() > 0)
+                hpa = (proxy::auth)
+                if (hpa::user != nil) && (hpa::user::length() > 0)
+                    data = Base64.new()::encodeBytes(Bytes::ofString((hpa::user.to_s + ":") + hpa::pass.to_s))::toString()
+                    self.setHeader("Proxy-Authorization","Basic " + data)
+                end
+            end
+            super(post)
+        end
+        def onData(data)
+            self.data = data
+            if @listener != nil
+                @listener::onData(data)
+            end
+        end
+        def onError(msg)
+            if @listener != nil
+                @listener::onError(msg)
+            else 
+                raise Exception,msg
+            end
+        end
+        def getData()
+            return @data
+        end
+        def getProxy()
+            proxy = Reflect::field(Http,"PROXY")
+            if proxy == nil
+                return nil
+            end
+            return (proxy)
+        end
+        def setProxy(proxy)
+            Reflect::setField(Http,"PROXY",proxy)
+        end
+        def setListener(listener)
+            self.listener = listener
+        end
 
-    attr_accessor :data
-    attr_accessor :listener
-    def initialize(url,listener)
-      super(url)
-      @listener = listener
-    end
-    def request(post)
-      proxy = getProxy()
-      if ((proxy!=nil)&&(proxy::host!=nil))&&(proxy::host::length()>0)
-        hpa = (proxy::auth)
-        if (hpa::user!=nil)&&(hpa::user::length()>0)
-          data = Base64.new()::encodeBytes(Bytes::ofString((hpa::user.to_s+":")+hpa::pass.to_s))::toString()
-          setHeader("Proxy-Authorization","Basic "+data)
-        end
-      end
-      super(post)
-    end
-    def onData(data)
-      @data = data
-      if @listener!=nil
-        @listener::onData(data)
-      end
-    end
-    def onError(msg)
-      if @listener!=nil
-        @listener::onError(msg)
-      else 
-        raise Exception,msg
-      end
-    end
-    def getData()
-      return @data
-    end
-    def getProxy()
-      proxy = Reflect::field(Http,"PROXY")
-      if proxy==nil
-        return nil
-      end
-      return (proxy)
-    end
-    def setProxy(proxy)
-      Reflect::setField(Http,"PROXY",proxy)
-    end
-    def setListener(listener)
-      @listener = listener
     end
-  end
 end

data/lib/com/wiris/plugin/impl/HttpListener.rb

@@ -1,8 +1,8 @@
 module WirisPlugin
 include  Wiris
-module HttpListenerInterface
-  def HttpListener
-    return true
-  end
-end
+    module HttpListenerInterface
+        def HttpListener
+            return true
+        end
+    end
 end

data/lib/com/wiris/plugin/impl/ImageFormatControllerPng.rb

@@ -1,73 +1,81 @@
 module WirisPlugin
 include  Wiris
-require('com/wiris/plugin/api/ImageFormatController.rb')
-  class ImageFormatControllerPng
-  extend ImageFormatControllerInterface
+    require('com/wiris/plugin/api/ImageFormatController.rb')
+    require('com/wiris/plugin/api/ImageFormatController.rb')
+    class ImageFormatControllerPng
+    extend ImageFormatControllerInterface
 
-  include Wiris
+    include Wiris
 
-    def initialize()
-      super()
-    end
-    def getContentType()
-      return "image/png"
-    end
-    def getMetrics(bytes,ref_output)
-      output = ref_output
-      width = 0
-      height = 0
-      dpi = 0
-      baseline = 0
-      bi = BytesInput.new(bytes)
-      n = bytes::length()
-      alloc = 10
-      b = Bytes::alloc(alloc)
-      bi::readBytes(b,0,8)
-      n-= 8
-      while n>0
-        len = bi::readInt32()
-        typ = bi::readInt32()
-        if typ==1229472850
-          width = bi::readInt32()
-          height = bi::readInt32()
-          bi::readInt32()
-          bi::readByte()
-        else 
-          if typ==1650545477
-            baseline = bi::readInt32()
-          else 
-            if typ==1883789683
-              dpi = bi::readInt32()
-              dpi = (Math::round(dpi/39.37))
-              bi::readInt32()
-              bi::readByte()
+        def initialize()
+            super()
+        end
+        def getContentType()
+            return "image/png"
+        end
+        def getMetrics(bytes, ref_output)
+            output = ref_output
+            width = 0
+            height = 0
+            dpi = 0
+            baseline = 0
+            bi = BytesInput.new(bytes)
+            n = bytes::length()
+            alloc = 10
+            b = Bytes::alloc(alloc)
+            bi::readBytes(b,0,8)
+            n -= 8
+            while n > 0
+                len = bi::readInt32()
+                typ = bi::readInt32()
+                if typ == 1229472850
+                    width = bi::readInt32()
+                    height = bi::readInt32()
+                    bi::readInt32()
+                    bi::readByte()
+                else 
+                    if typ == 1650545477
+                        baseline = bi::readInt32()
+                    else 
+                        if typ == 1883789683
+                            dpi = bi::readInt32()
+                            dpi = (Math::round(dpi/39.37))
+                            bi::readInt32()
+                            bi::readByte()
+                        else 
+                            if len > alloc
+                                alloc = len
+                                b = Bytes::alloc(alloc)
+                            end
+                            bi::readBytes(b,0,len)
+                        end
+                    end
+                end
+                bi::readInt32()
+                n -= len + 12
+            end
+            if output != nil
+                PropertiesTools::setProperty(output,"width","" + width.to_s)
+                PropertiesTools::setProperty(output,"height","" + height.to_s)
+                PropertiesTools::setProperty(output,"baseline","" + baseline.to_s)
+                if dpi != 96
+                    PropertiesTools::setProperty(output,"dpi","" + dpi.to_s)
+                end
+                r = ""
             else 
-              if len>alloc
-                alloc = len
-                b = Bytes::alloc(alloc)
-              end
-              bi::readBytes(b,0,len)
+                r = (((("&cw=" + width.to_s) + "&ch=") + height.to_s) + "&cb=") + baseline.to_s
+                if dpi != 96
+                    r = (r + "&dpi=") + dpi.to_s
+                end
             end
-          end
-        end
-        bi::readInt32()
-        n-= len+12
-      end
-      if output!=nil
-        PropertiesTools::setProperty(output,"width",""+width.to_s)
-        PropertiesTools::setProperty(output,"height",""+height.to_s)
-        PropertiesTools::setProperty(output,"baseline",""+baseline.to_s)
-        if dpi!=96
-          PropertiesTools::setProperty(output,"dpi",""+dpi.to_s)
+            return r
         end
-        r = ""
-      else 
-        r = (((("&cw="+width.to_s)+"&ch=")+height.to_s)+"&cb=")+baseline.to_s
-        if dpi!=96
-          r = (r+"&dpi=")+dpi.to_s
+        def scalateMetrics(dpi, metrics)
+            f = 96/dpi
+            metrics::set("width",(f*metrics::get("width")))
+            metrics::set("height",(f*metrics::get("height")))
+            metrics::set("baseline",(f*metrics::get("baseline")))
         end
-      end
-      return r
+
     end
-  end
 end