Skip to content

Commit

Permalink
add order_type
Browse files Browse the repository at this point in the history
  • Loading branch information
maltaesousa committed Feb 19, 2021
1 parent d33e59c commit 3e8748b
Show file tree
Hide file tree
Showing 27 changed files with 123 additions and 195 deletions.
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ Le code source a été compilé avec NetBeans 8.1 dans un environnement Linux. *

Le logiciel NetBeans 8.1 version Linux est requis, il est téléchargeable sur la page suivante : https://netbeans.org/community/releases/81/

Il faut également installer une nouvelle version de maven et la référencer dans les options de netbeans (Java > Maven) car les dépôts maven n'acceptent plus les requêtes non-https.

## Importer le code dans NetBeans

1. Télécharger le zip correspondant au code source. Le zip doit contenir les deux dossiers **connectors** et **plugin-interface**
Expand All @@ -28,11 +30,12 @@ Le logiciel NetBeans 8.1 version Linux est requis, il est téléchargeable sur l

## Compiler le code source

1. Vérifier les propriétés de chacun des deux projet, en accédant aux propriétés (Clic droit -> Properties)
1. Vérifier les propriétés de chacun des deux projets, en accédant aux propriétés (Clic droit -> Properties)
- Catégorie General : modifier si besoin la version
- Categorie Build>Compile : choisir la plateforme JAVA JDK 1.7

2. Compiler le projet extract-connector-geoshop :
2. Compiler les deux projets extract-interface et extract-connector-geoshop :
- Depuis l'onglet files
- clic droit -> Build With Dependencies (les tests unitaires sont exécutés en même temps)
- Le fichier jar compilé est généré dans un sous-répertoire **target** du dossier **extract-connector-geoshop** (ex : /home/neuchatel/projects/geoshop/target/extract-connector-geoshop-1.2-RELEASE.jar)

Expand Down
57 changes: 57 additions & 0 deletions connectors/extract-connector-geoshop/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
#
# Project specific excludes
#

tomcat

#
# Default excludes
#

# Binaries
*.7z
*.dmg
*.gz
*.iso
*.jar
*.rar
*.tar
*.zip
*.war
*.ear
*.sar
*.class

# Maven
target/

# IntelliJ project files
*.iml
*.iws
*.ipr
.idea/

# eclipse project file
.settings/
.classpath
.project

# NetBeans specific
nbproject/private/
build/
nbbuild/
dist/
nbdist/
nbactions.xml
nb-configuration.xml


# OS
.DS_Store

# Misc
*.swp
release.properties
pom.xml.releaseBackup
pom.xml.tag

2 changes: 1 addition & 1 deletion connectors/extract-connector-geoshop/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.easysdi</groupId>
<artifactId>extract-connector-geoshop</artifactId>
<version>1.2-RELEASE</version>
<version>1.2.1</version>
<packaging>jar</packaging>
<dependencies>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1280,6 +1280,7 @@ private ConnectorImportResult addImportedProductsToResult(final String responseS
JSONObject orderNode = orderArray.getJSONObject(i);
final int orderId = orderNode.getInt("id");
String orderLabel = orderNode.getString("title");
String orderType = orderNode.getString("order_type");

JSONObject client = orderNode.getJSONObject("client");
String clientName = client.getString("first_name") + " " + client.getString("last_name");
Expand Down Expand Up @@ -1316,7 +1317,7 @@ private ConnectorImportResult addImportedProductsToResult(final String responseS
product.setProductGuid(String.valueOf(productId));
product.setProductLabel(productLabel);
product.setOthersParameters("{\"data_format\" : \"" + productsArray.getJSONObject(productIndex)
.getString("data_format") + "\"}");
.getString("data_format") + "\",\n" + "\"order_type\" : \"" + orderType + "\"}");
product.setPerimeter(orderNode.getString("geom"));
product.setSurface(orderNode.getDouble("geom_area"));

Expand Down
Empty file.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

This file was deleted.

Empty file.
Binary file not shown.
57 changes: 57 additions & 0 deletions plugin-interface/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
#
# Project specific excludes
#

tomcat

#
# Default excludes
#

# Binaries
*.7z
*.dmg
*.gz
*.iso
*.jar
*.rar
*.tar
*.zip
*.war
*.ear
*.sar
*.class

# Maven
target/

# IntelliJ project files
*.iml
*.iws
*.ipr
.idea/

# eclipse project file
.settings/
.classpath
.project

# NetBeans specific
nbproject/private/
build/
nbbuild/
dist/
nbdist/
nbactions.xml
nb-configuration.xml


# OS
.DS_Store

# Misc
*.swp
release.properties
pom.xml.releaseBackup
pom.xml.tag

2 changes: 1 addition & 1 deletion plugin-interface/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.easysdi</groupId>
<artifactId>extract-plugin-interface</artifactId>
<version>1.2-RELEASE</version>
<version>1.2.1</version>
<packaging>jar</packaging>
<dependencies>
<dependency>
Expand Down

0 comments on commit 3e8748b

Please sign in to comment.