added new options --proxy, --proxyPort (fixes claeis#20)

pumelo · Jan 13, 2017 · 30d608c · 30d608c
1 parent 54c1f82
commit 30d608c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
@@ -16,6 +16,7 @@ ili2pg/ili2gpkg 3.6.1 (2017-01-xx)
 -----------------------------
 - fixed export of references to a class with subClass mapping
 - add docu from ili to fk columns
+- added new options --proxy, --proxyPort
 
 ili2pg/ili2gpkg 3.6.0 (2016-12-30)
 -----------------------------

diff --git a/docs/ili2db.rst b/docs/ili2db.rst
@@ -452,6 +452,10 @@ Optionen:
 +-------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | --log filename                | Schreibt die log-Meldungen in eine Datei.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
 +-------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| --proxy host                  | Definiert den Name des Hosts der als Proxy für den Zugriff auf Modell-Repositories benutzt werden soll.                                                                                                                                                                                                                                                                                                                                                                                                                                    |
++-------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| --proxyPort port              | Port auf dem Proxy.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
++-------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | --gui                         | Startet ein einfaches GUI.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
 +-------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | --trace                       | Erzeugt zusätzliche Log-Meldungen (wichtig für Programm-Fehleranalysen)                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |

diff --git a/src/ch/ehi/ili2db/AbstractMain.java b/src/ch/ehi/ili2db/AbstractMain.java
@@ -28,6 +28,7 @@
 import ch.ehi.ili2db.mapping.NameMapping;
 import ch.ehi.ili2db.base.DbUrlConverter;
 import ch.ehi.sqlgen.generator.SqlConfiguration;
+import ch.interlis.ili2c.gui.UserSettings;
 
 /**
  * @author ce
@@ -249,6 +250,7 @@ public void domain(String args[]){
 				argi++;
 				config.setNameOptimization(config.NAME_OPTIMIZATION_TOPIC);
 			}else if(arg.equals("--maxNameLength")){
+				argi++;
 				config.setMaxSqlNameLength(args[argi]);
 				argi++;
 			}else if(arg.equals("--structWithGenericRef")){
@@ -279,6 +281,14 @@ public void domain(String args[]){
 			}else if(arg.equals("--ILIGML20")){
 				argi++;
 				config.setTransferFileFormat(Config.ILIGML20);
+			}else if(arg.equals("--proxy")){
+				argi++;
+				config.setValue(UserSettings.HTTP_PROXY_HOST,args[argi]);
+				argi++;
+			}else if(arg.equals("--proxyPort")){
+				argi++;
+				config.setValue(UserSettings.HTTP_PROXY_PORT,args[argi]);
+				argi++;
 			}else if(arg.equals("--version")){
 				printVersion();
 				return;
@@ -343,6 +353,8 @@ public void domain(String args[]){
 					System.err.println("--createUnique         create UNIQUE db constraints.");
 					System.err.println("--ILIGML20             use eCH-0118-2.0 as transferformat");
 					printSpecificOptions();
+				    System.err.println("--proxy host           proxy server to access model repositories.");
+				    System.err.println("--proxyPort port       proxy port to access model repositories.");
 					System.err.println("--log filename         log message to given file.");
 					System.err.println("--gui                  start GUI.");
 					System.err.println("--trace                enable trace messages.");