diff --git a/algorithms/ili2pg_algorithms.py b/algorithms/ili2pg_algorithms.py index 2c45d77..47c7a4c 100644 --- 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 index 3f276ba..8f902a5 100644 --- 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 index c6bb374..c61b899 100644 --- 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 new file mode 100644 index 0000000..c843754 Binary files /dev/null and b/jars/ili2gpkg-5.1.0.jar differ diff --git a/jars/ili2gpkg.jar b/jars/ili2gpkg.jar deleted file mode 100644 index eacd81d..0000000 Binary files a/jars/ili2gpkg.jar and /dev/null differ diff --git a/jars/ili2pg-5.1.0.jar b/jars/ili2pg-5.1.0.jar new file mode 100644 index 0000000..972f0f9 Binary files /dev/null and b/jars/ili2pg-5.1.0.jar differ diff --git a/jars/ili2pg.jar b/jars/ili2pg.jar deleted file mode 100644 index fc974b8..0000000 Binary files a/jars/ili2pg.jar and /dev/null differ diff --git a/jars/libs/activation-1.1.1.jar b/jars/libs/activation-1.1.1.jar new file mode 100644 index 0000000..1b703ab Binary files /dev/null and b/jars/libs/activation-1.1.1.jar differ diff --git a/jars/libs/antlr.jar b/jars/libs/antlr-2.7.7.jar similarity index 84% rename from jars/libs/antlr.jar rename to jars/libs/antlr-2.7.7.jar index 3702b64..5e5f14b 100644 Binary files a/jars/libs/antlr.jar and b/jars/libs/antlr-2.7.7.jar differ diff --git a/jars/libs/base64-2.3.9.jar b/jars/libs/base64-2.3.9.jar new file mode 100644 index 0000000..eaf2b83 Binary files /dev/null and b/jars/libs/base64-2.3.9.jar differ diff --git a/jars/libs/caffeine-2.6.2.jar b/jars/libs/caffeine-2.6.2.jar new file mode 100644 index 0000000..f2f724b Binary files /dev/null and b/jars/libs/caffeine-2.6.2.jar differ diff --git a/jars/libs/checker-qual-3.31.0.jar b/jars/libs/checker-qual-3.31.0.jar new file mode 100644 index 0000000..585c295 Binary files /dev/null and b/jars/libs/checker-qual-3.31.0.jar differ diff --git a/jars/libs/ehibasics-1.4.1.jar b/jars/libs/ehibasics-1.4.1.jar new file mode 100644 index 0000000..be7b8f6 Binary files /dev/null and b/jars/libs/ehibasics-1.4.1.jar differ diff --git a/jars/libs/ehibasics.jar b/jars/libs/ehibasics.jar deleted file mode 100644 index c46d738..0000000 Binary files a/jars/libs/ehibasics.jar and /dev/null differ diff --git a/jars/libs/ehisqlgen-1.16.0.jar b/jars/libs/ehisqlgen-1.16.0.jar new file mode 100644 index 0000000..43fb7a2 Binary files /dev/null and b/jars/libs/ehisqlgen-1.16.0.jar differ diff --git a/jars/libs/ehisqlgen.jar b/jars/libs/ehisqlgen.jar deleted file mode 100644 index be51662..0000000 Binary files a/jars/libs/ehisqlgen.jar and /dev/null differ diff --git a/jars/libs/gson-2.6.2.jar b/jars/libs/gson-2.6.2.jar deleted file mode 100644 index 9d78626..0000000 Binary files a/jars/libs/gson-2.6.2.jar and /dev/null differ diff --git a/jars/libs/ili2c-core-5.4.0.jar b/jars/libs/ili2c-core-5.4.0.jar new file mode 100644 index 0000000..d5b5523 Binary files /dev/null and b/jars/libs/ili2c-core-5.4.0.jar differ diff --git a/jars/libs/ili2c-core.jar b/jars/libs/ili2c-core.jar deleted file mode 100644 index 3bcf4d1..0000000 Binary files a/jars/libs/ili2c-core.jar and /dev/null differ diff --git a/jars/libs/ili2c-tool-5.4.0.jar b/jars/libs/ili2c-tool-5.4.0.jar new file mode 100644 index 0000000..332d4fd Binary files /dev/null and b/jars/libs/ili2c-tool-5.4.0.jar differ diff --git a/jars/libs/ili2c-tool.jar b/jars/libs/ili2c-tool.jar deleted file mode 100644 index 0a31f9a..0000000 Binary files a/jars/libs/ili2c-tool.jar and /dev/null differ diff --git a/jars/libs/ili2db-5.1.0.jar b/jars/libs/ili2db-5.1.0.jar new file mode 100644 index 0000000..9debacb Binary files /dev/null and b/jars/libs/ili2db-5.1.0.jar differ diff --git a/jars/libs/iox-api-1.0.3.jar b/jars/libs/iox-api-1.0.3.jar new file mode 100644 index 0000000..ced8da0 Binary files /dev/null and b/jars/libs/iox-api-1.0.3.jar differ diff --git a/jars/libs/iox-api.jar b/jars/libs/iox-api.jar deleted file mode 100644 index 0c68a23..0000000 Binary files a/jars/libs/iox-api.jar and /dev/null differ diff --git a/jars/libs/iox-ili-1.22.0.jar b/jars/libs/iox-ili-1.22.0.jar new file mode 100644 index 0000000..8c7c45f Binary files /dev/null and b/jars/libs/iox-ili-1.22.0.jar differ diff --git a/jars/libs/iox-ili.jar b/jars/libs/iox-ili.jar deleted file mode 100644 index 493c7ed..0000000 Binary files a/jars/libs/iox-ili.jar and /dev/null differ diff --git a/jars/libs/jackson-core-2.9.7.jar b/jars/libs/jackson-core-2.9.7.jar new file mode 100644 index 0000000..fa46a7f Binary files /dev/null and b/jars/libs/jackson-core-2.9.7.jar differ diff --git a/jars/libs/javax.activation-api-1.2.0.jar b/jars/libs/javax.activation-api-1.2.0.jar new file mode 100644 index 0000000..986c365 Binary files /dev/null and b/jars/libs/javax.activation-api-1.2.0.jar differ diff --git a/jars/libs/jaxb-api-2.3.1.jar b/jars/libs/jaxb-api-2.3.1.jar new file mode 100644 index 0000000..4565865 Binary files /dev/null and b/jars/libs/jaxb-api-2.3.1.jar differ diff --git a/jars/libs/jaxb-core-2.3.0.1.jar b/jars/libs/jaxb-core-2.3.0.1.jar new file mode 100644 index 0000000..431e143 Binary files /dev/null and b/jars/libs/jaxb-core-2.3.0.1.jar differ diff --git a/jars/libs/jaxb-impl-2.3.2.jar b/jars/libs/jaxb-impl-2.3.2.jar new file mode 100644 index 0000000..58035e8 Binary files /dev/null and b/jars/libs/jaxb-impl-2.3.2.jar differ diff --git a/jars/libs/jcl-over-slf4j-1.7.25.jar b/jars/libs/jcl-over-slf4j-1.7.25.jar new file mode 100644 index 0000000..8e7fec8 Binary files /dev/null and b/jars/libs/jcl-over-slf4j-1.7.25.jar differ diff --git a/jars/libs/jna-4.5.1.jar b/jars/libs/jna-4.5.1.jar new file mode 100644 index 0000000..68216af Binary files /dev/null and b/jars/libs/jna-4.5.1.jar differ diff --git a/jars/libs/jna-platform-4.5.1.jar b/jars/libs/jna-platform-4.5.1.jar new file mode 100644 index 0000000..5aeb3e4 Binary files /dev/null and b/jars/libs/jna-platform-4.5.1.jar differ diff --git a/jars/libs/postgresql-42.6.0.jar b/jars/libs/postgresql-42.6.0.jar new file mode 100644 index 0000000..02f902a Binary files /dev/null and b/jars/libs/postgresql-42.6.0.jar differ diff --git a/jars/libs/postgresql-9.4.1208.jre6.jar b/jars/libs/postgresql-9.4.1208.jre6.jar deleted file mode 100644 index 9718d6e..0000000 Binary files a/jars/libs/postgresql-9.4.1208.jre6.jar and /dev/null differ diff --git a/jars/libs/slf4j-api-1.7.25.jar b/jars/libs/slf4j-api-1.7.25.jar new file mode 100644 index 0000000..0143c09 Binary files /dev/null and b/jars/libs/slf4j-api-1.7.25.jar differ diff --git a/jars/libs/sqlite-jdbc-3.8.11.2.jar b/jars/libs/sqlite-jdbc-3.8.11.2.jar deleted file mode 100644 index 70be427..0000000 Binary files a/jars/libs/sqlite-jdbc-3.8.11.2.jar and /dev/null differ diff --git a/jars/libs/toml4j-0.5.1.jar b/jars/libs/toml4j-0.5.1.jar deleted file mode 100644 index b562da9..0000000 Binary files a/jars/libs/toml4j-0.5.1.jar and /dev/null differ diff --git a/jars/libs/waffle-jna-1.9.1.jar b/jars/libs/waffle-jna-1.9.1.jar new file mode 100644 index 0000000..2d1a38c Binary files /dev/null and b/jars/libs/waffle-jna-1.9.1.jar differ diff --git a/metadata.txt b/metadata.txt index 27e08e1..564e176 100644 --- 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=pka@sourcepole.ch +hasProcessingProvider=yes changelog= 0.14.8