sourcepole · webrian · Jan 2, 2023 · Jan 3, 2023 · Jan 3, 2023 · May 6, 2024
diff --git a/algorithms/ili2pg_algorithms.py b/algorithms/ili2pg_algorithms.py
@@ -408,6 +408,7 @@ def processAlgorithm(self, parameters, context, feedback):
         ili2dbargs.extend(["--dbschema", dbschema])
 
         xtf = parameters.get(self.XTF)
+        ili2dbargs.extend(["--log", "%s.log" % xtf])
         ili2dbargs.append(xtf)
 
         IliUtils.runJava(
@@ -463,7 +464,8 @@ def initAlgorithm(self, config=None):
             self.ILIMODELS,
             self.tr('Interlis models')))
         self.addParameter(QgsProcessingParameterFileDestination(
-            self.XTF, description="Interlis transfer output file"))
+            self.OUTPUT,
+            self.tr('Interlis transfer output file')))
         # ext: xtf, xml, itf
 
     def processAlgorithm(self, parameters, context, feedback):
@@ -486,11 +488,12 @@ def processAlgorithm(self, parameters, context, feedback):
         if models:
             ili2dbargs.extend(["--models", models])
 
-        xtf = parameters.get(self.XTF)
+        xtf = parameters.get(self.OUTPUT)
+        ili2dbargs.extend(["--log", "%s.log" % xtf])
         ili2dbargs.append(xtf)
 
         IliUtils.runJava(
             ProcessingConfig.getSetting(IliUtils.ILI2PG_JAR),
             ili2dbargs)
 
-        return {}
+        return { self.OUTPUT: xtf }
diff --git a/algorithms/interlis_provider.py b/algorithms/interlis_provider.py
@@ -61,11 +61,11 @@ def initializeSettings(self):
         ProcessingConfig.addSetting(
             Setting(self.getDescription(), IliUtils.ILI2PG_JAR,
                     "ili2pg.jar path",
-                    os.path.join(jarpath, "ili2pg.jar")))
+                    os.path.join(jarpath, "ili2pg-5.1.0.jar")))
         ProcessingConfig.addSetting(
             Setting(self.getDescription(), IliUtils.ILI2GPKG_JAR,
                     "ili2gpkg.jar path",
-                    os.path.join(jarpath, "ili2gpkg.jar")))
+                    os.path.join(jarpath, "ili2gpkg-5.1.0.jar")))
 
     def unload(self):
         QgsProcessingProvider.unload(self)

diff --git a/interlis.py b/interlis.py
@@ -57,6 +57,9 @@ def __init__(self, iface):
         # Processing provider
         self.provider = InterlisProvider()
 
+    def initProcessing(self):
+        QgsApplication.processingRegistry().addProvider(self.provider)
+
     def initGui(self):
         # Create action that will start plugin configuration
         self.action = QAction(

diff --git a/jars/ili2gpkg-5.1.0.jar b/jars/ili2gpkg-5.1.0.jar
diff --git a/jars/ili2gpkg.jar b/jars/ili2gpkg.jar
diff --git a/jars/ili2pg-5.1.0.jar b/jars/ili2pg-5.1.0.jar
diff --git a/jars/ili2pg.jar b/jars/ili2pg.jar
diff --git a/jars/libs/activation-1.1.1.jar b/jars/libs/activation-1.1.1.jar
diff --git a/jars/libs/antlr.jar → jars/libs/antlr-2.7.7.jar b/jars/libs/antlr.jar → jars/libs/antlr-2.7.7.jar
diff --git a/jars/libs/base64-2.3.9.jar b/jars/libs/base64-2.3.9.jar
diff --git a/jars/libs/caffeine-2.6.2.jar b/jars/libs/caffeine-2.6.2.jar
diff --git a/jars/libs/checker-qual-3.31.0.jar b/jars/libs/checker-qual-3.31.0.jar
diff --git a/jars/libs/ehibasics-1.4.1.jar b/jars/libs/ehibasics-1.4.1.jar
diff --git a/jars/libs/ehibasics.jar b/jars/libs/ehibasics.jar
diff --git a/jars/libs/ehisqlgen-1.16.0.jar b/jars/libs/ehisqlgen-1.16.0.jar
diff --git a/jars/libs/ehisqlgen.jar b/jars/libs/ehisqlgen.jar
diff --git a/jars/libs/gson-2.6.2.jar b/jars/libs/gson-2.6.2.jar
diff --git a/jars/libs/ili2c-core-5.4.0.jar b/jars/libs/ili2c-core-5.4.0.jar
diff --git a/jars/libs/ili2c-core.jar b/jars/libs/ili2c-core.jar
diff --git a/jars/libs/ili2c-tool-5.4.0.jar b/jars/libs/ili2c-tool-5.4.0.jar
diff --git a/jars/libs/ili2c-tool.jar b/jars/libs/ili2c-tool.jar
diff --git a/jars/libs/ili2db-5.1.0.jar b/jars/libs/ili2db-5.1.0.jar
diff --git a/jars/libs/iox-api-1.0.3.jar b/jars/libs/iox-api-1.0.3.jar
diff --git a/jars/libs/iox-api.jar b/jars/libs/iox-api.jar
diff --git a/jars/libs/iox-ili-1.22.0.jar b/jars/libs/iox-ili-1.22.0.jar
diff --git a/jars/libs/iox-ili.jar b/jars/libs/iox-ili.jar
diff --git a/jars/libs/jackson-core-2.9.7.jar b/jars/libs/jackson-core-2.9.7.jar
diff --git a/jars/libs/javax.activation-api-1.2.0.jar b/jars/libs/javax.activation-api-1.2.0.jar
diff --git a/jars/libs/jaxb-api-2.3.1.jar b/jars/libs/jaxb-api-2.3.1.jar
diff --git a/jars/libs/jaxb-core-2.3.0.1.jar b/jars/libs/jaxb-core-2.3.0.1.jar
diff --git a/jars/libs/jaxb-impl-2.3.2.jar b/jars/libs/jaxb-impl-2.3.2.jar
diff --git a/jars/libs/jcl-over-slf4j-1.7.25.jar b/jars/libs/jcl-over-slf4j-1.7.25.jar
diff --git a/jars/libs/jna-4.5.1.jar b/jars/libs/jna-4.5.1.jar
diff --git a/jars/libs/jna-platform-4.5.1.jar b/jars/libs/jna-platform-4.5.1.jar
diff --git a/jars/libs/postgresql-42.6.0.jar b/jars/libs/postgresql-42.6.0.jar
diff --git a/jars/libs/postgresql-9.4.1208.jre6.jar b/jars/libs/postgresql-9.4.1208.jre6.jar
diff --git a/jars/libs/slf4j-api-1.7.25.jar b/jars/libs/slf4j-api-1.7.25.jar
diff --git a/jars/libs/sqlite-jdbc-3.8.11.2.jar b/jars/libs/sqlite-jdbc-3.8.11.2.jar
diff --git a/jars/libs/toml4j-0.5.1.jar b/jars/libs/toml4j-0.5.1.jar
diff --git a/jars/libs/waffle-jna-1.9.1.jar b/jars/libs/waffle-jna-1.9.1.jar
diff --git a/metadata.txt b/metadata.txt
@@ -4,9 +4,10 @@ qgisMinimumVersion=3.6
 description=Interlis Import/Export
 about=Load Interlis data into QGIS layer and import/export functionality for PostGIS.
   Contains a GUI and Processing algorithms for additional tasks requiring a Java.
-version=0.14.8
+version=dev
 author=Pirmin Kalberer (Sourcepole)
 [email protected]
+hasProcessingProvider=yes
 
 changelog=
   0.14.8