eFlore/Applications.cel – /branches/v1.7-croissant/jrest/services/CelImageDoublon.php

Rev 1914 – merge: réintégration du trunk/ dans v1.7-croissant

raphael — Wed, 06 Nov 2013 16:26:31 +0100

raphael – 62 file(s) modified
merge: réintégration du trunk/ dans v1.7-croissant

~ /branches/v1.7-croissant
+ /branches/v1.7-croissant/build.properties (copied from /trunk/build.properties@1878)
~ /branches/v1.7-croissant/build.xml
~ /branches/v1.7-croissant/Changelog
~ /branches/v1.7-croissant/doc
~ /branches/v1.7-croissant/doc/bdd/cel_v2.sql
~ /branches/v1.7-croissant/doc/bdd/schema_bdd_cel_v2.mwb
~ /branches/v1.7-croissant/jrest/jrest.ini.php.defaut
~ /branches/v1.7-croissant/jrest/lib/Cel.php
~ /branches/v1.7-croissant/jrest/lib/GestionObservation.php
~ /branches/v1.7-croissant/jrest/lib/ImageRecreation.php
~ /branches/v1.7-croissant/jrest/lib/LiaisonMotsCles.php
~ /branches/v1.7-croissant/jrest/lib/RechercheInfosTaxonBeta.php
~ /branches/v1.7-croissant/jrest/services/CelImageDoublon.php
~ /branches/v1.7-croissant/jrest/services/CelValidationObservation.php
~ /branches/v1.7-croissant/jrest/services/CelWidgetMapPoint.php
+ /branches/v1.7-croissant/jrest/services/CelWidgetUploadImageTemp.php (copied from /trunk/jrest/services/CelWidgetUploadImageTemp.php@1894)
~ /branches/v1.7-croissant/jrest/services/ImportXLS.php
~ /branches/v1.7-croissant/jrest/services/InventoryKeyWordImageLink.php
~ /branches/v1.7-croissant/jrest/services/InventoryKeyWordList.php
~ /branches/v1.7-croissant/jrest/services/InventoryKeyWordObsLink.php
~ /branches/v1.7-croissant/jrest/services/InventoryObservationList.php
~ /branches/v1.7-croissant/jrest/services/InventoryTransmit.php
+ /branches/v1.7-croissant/jrest/services/squelettes/image_temp.tpl.xml (copied from /trunk/jrest/services/squelettes/image_temp.tpl.xml@1894)
~ /branches/v1.7-croissant/jrest/tests/api.php
~ /branches/v1.7-croissant/jrest/tests/cmd-test.php
~ /branches/v1.7-croissant/jrest/tests/phptests/determ-espece-badref-bdnffnn.result.php
~ /branches/v1.7-croissant/jrest/tests/phptests/determ-espece-bdnffnt.result.php
+ /branches/v1.7-croissant/jrest/tests/phptests/determ-espece-from-nom-ret.result.php (copied from /trunk/jrest/tests/phptests/determ-espece-from-nom-ret.result.php@1878)
+ /branches/v1.7-croissant/jrest/tests/phptests/determ-espece-from-nom-ret.test.php (copied from /trunk/jrest/tests/phptests/determ-espece-from-nom-ret.test.php@1878)
~ /branches/v1.7-croissant/jrest/tests/phptests/determ-espece-noref-bdnffnn.result.php
+ /branches/v1.7-croissant/jrest/tests/phptests/determ-espece-ref-badbdnffnn.result.php (copied from /trunk/jrest/tests/phptests/determ-espece-ref-badbdnffnn.result.php@1853)
+ /branches/v1.7-croissant/jrest/tests/phptests/determ-espece-ref-badbdnffnn.test.php (copied from /trunk/jrest/tests/phptests/determ-espece-ref-badbdnffnn.test.php@1853)
+ /branches/v1.7-croissant/jrest/tests/phptests/ref-nom-nonum.result.php (copied from /trunk/jrest/tests/phptests/ref-nom-nonum.result.php@1853)
+ /branches/v1.7-croissant/jrest/tests/phptests/ref-nom-nonum.test.php (copied from /trunk/jrest/tests/phptests/ref-nom-nonum.test.php@1853)
+ /branches/v1.7-croissant/jrest/tests/phptests/ref-nom-num.result.php (copied from /trunk/jrest/tests/phptests/ref-nom-num.result.php@1853)
+ /branches/v1.7-croissant/jrest/tests/phptests/ref-nom-num.test.php (copied from /trunk/jrest/tests/phptests/ref-nom-num.test.php@1853)
+ /branches/v1.7-croissant/jrest/tests/phptests/ref-nonom-nonum.result.php (copied from /trunk/jrest/tests/phptests/ref-nonom-nonum.result.php@1853)
+ /branches/v1.7-croissant/jrest/tests/phptests/ref-nonom-nonum.test.php (copied from /trunk/jrest/tests/phptests/ref-nonom-nonum.test.php@1853)
+ /branches/v1.7-croissant/jrest/tests/phptests/ref-nonom-num.result.php (copied from /trunk/jrest/tests/phptests/ref-nonom-num.result.php@1853)
+ /branches/v1.7-croissant/jrest/tests/phptests/ref-nonom-num.test.php (copied from /trunk/jrest/tests/phptests/ref-nonom-num.test.php@1853)
~ /branches/v1.7-croissant/jrest/tests/phptests/transmission.result.php
+ /branches/v1.7-croissant/src/org/tela_botanica/cel-test.gwt.xml (copied from /trunk/src/org/tela_botanica/cel-test.gwt.xml@1878)
~ /branches/v1.7-croissant/src/org/tela_botanica/cel2.gwt.xml
~ /branches/v1.7-croissant/src/org/tela_botanica/client/vues/observation/FormulaireSaisieObservationVue.java
+ /branches/v1.7-croissant/src/org/tela_botanica/public (copied from /trunk/src/org/tela_botanica/public@1878)
+ /branches/v1.7-croissant/TODO (copied from /trunk/TODO@1878)
+ /branches/v1.7-croissant/vendors (copied from /trunk/vendors@1853)
+ /branches/v1.7-croissant/vendors/PHPExcel (copied from /trunk/vendors/PHPExcel@1878)
~ /branches/v1.7-croissant/war/config.defaut.js
~ /branches/v1.7-croissant/widget/modules/cartopoint/squelettes/carte_defaut.tpl.html
~ /branches/v1.7-croissant/widget/modules/photo/config.defaut.ini
~ /branches/v1.7-croissant/widget/modules/photo/Photo.php
~ /branches/v1.7-croissant/widget/modules/saisie
~ /branches/v1.7-croissant/widget/modules/saisie/Saisie.php
~ /branches/v1.7-croissant/widget/modules/saisie/squelettes/biodiversite34/js/biodiversite34.js
~ /branches/v1.7-croissant/widget/modules/saisie/squelettes/defaut/defaut.tpl.html
~ /branches/v1.7-croissant/widget/modules/saisie/squelettes/defaut/js/defaut.js
~ /branches/v1.7-croissant/widget/modules/saisie/squelettes/florileges/florileges.tpl.html
~ /branches/v1.7-croissant/widget/modules/saisie/squelettes/sauvages/js/sauvages.js
~ /branches/v1.7-croissant/widget/modules/saisie/squelettes/sauvages/sauvages.tpl.html
~ /branches/v1.7-croissant/widget/widget.ini.defaut.php

Rev 1840 – branche: création de la branche "v1.7-croissant"

raphael — Tue, 17 Sep 2013 14:27:09 +0200

raphael – 1 file(s) modified
branche: création de la branche "v1.7-croissant"

+ /branches/v1.7-croissant (copied from /trunk@1839)

Rev 1765 – merge: branche "topic-dbsingleton"

raphael — Thu, 25 Jul 2013 15:56:05 +0200

raphael – 45 file(s) modified
merge: branche "topic-dbsingleton"

~ /trunk
+ /trunk/jrest/lib/Bdd2.php (copied from /branches/topic-dbsingleton/jrest/lib/Bdd2.php@1764)
~ /trunk/jrest/lib/Cel.php
~ /trunk/jrest/lib/FormateurGroupeColonne.php
~ /trunk/jrest/lib/GestionChampsEtendus.php
~ /trunk/jrest/lib/GestionImage.php
~ /trunk/jrest/lib/GestionObservation.php
~ /trunk/jrest/lib/LiaisonMotsCles.php
~ /trunk/jrest/lib/RechercheImage.php
~ /trunk/jrest/lib/RechercheInfosTaxon.php
~ /trunk/jrest/lib/RechercheObservation.php
~ /trunk/jrest/services/CelImage.php
~ /trunk/jrest/services/CelImageDoublon.php
~ /trunk/jrest/services/CelMotCle.php
~ /trunk/jrest/services/CelStatistique.php
~ /trunk/jrest/services/CelStatistiqueTxt.php
~ /trunk/jrest/services/CelSyndicationImage.php
~ /trunk/jrest/services/CelSyndicationObservation.php
~ /trunk/jrest/services/CelWidgetMap.php
~ /trunk/jrest/services/CelWidgetMapPoint.php
~ /trunk/jrest/services/CelWidgetSaisie.php
~ /trunk/jrest/services/CoordSearch.php
~ /trunk/jrest/services/ImageContribution.php
~ /trunk/jrest/services/ImageDateList.php
~ /trunk/jrest/services/ImageRDF.php
~ /trunk/jrest/services/ImportXLS.php
~ /trunk/jrest/services/InventoryByDept.php
~ /trunk/jrest/services/InventoryCheck.php
~ /trunk/jrest/services/InventoryContributionList.php
~ /trunk/jrest/services/InventoryDateList.php
~ /trunk/jrest/services/InventoryImageLink.php
~ /trunk/jrest/services/InventoryImportExcel.php
~ /trunk/jrest/services/InventoryKeyWordList.php
~ /trunk/jrest/services/InventoryLocationList.php
~ /trunk/jrest/services/InventoryPDF.php
~ /trunk/jrest/services/InventoryTransmit.php
~ /trunk/jrest/services/InventoryUserList.php
~ /trunk/jrest/services/LicenceUtilisateur.php
~ /trunk/jrest/services/LocationSearch.php
~ /trunk/jrest/services/Resume.php
~ /trunk/jrest/services/SelfRefList.php
~ /trunk/jrest/services/User.php
+ /trunk/scripts/modules/maj-code-DB-access-201307.sh (copied from /branches/topic-dbsingleton/scripts/modules/maj-code-DB-access-201307.sh@1764)
~ /trunk/src/org/tela_botanica/client/vues/image/GalerieImageVue.java
~ /trunk/widget/modules/saisie

Rev 1358 – Migration du service celimagedoublon

aurelien — Thu, 31 May 2012 11:00:19 +0200

aurelien – 1 file(s) modified
Migration du service celimagedoublon

~ /trunk/jrest/services/CelImageDoublon.php

Rev 970 – Gestion correcte des mots clés pour les images et les ...

aurelien — Tue, 27 Sep 2011 17:54:09 +0200

aurelien – 32 file(s) modified
Gestion correcte des mots clés pour les images et les obs + adaptation de l'upload d'image à la nouvelle base de données + utilisation de exiftool

~ /trunk/jrest/lib/ExtracteurMetadonnees.php
~ /trunk/jrest/lib/GestionImage.php
~ /trunk/jrest/lib/ImageRecreation.php
~ /trunk/jrest/lib/LiaisonMotsCles.php
~ /trunk/jrest/lib/Spreadsheet/Excel/Writer.php
~ /trunk/jrest/lib/Spreadsheet/Excel/Writer/BIFFwriter.php
~ /trunk/jrest/lib/Spreadsheet/Excel/Writer/Format.php
~ /trunk/jrest/lib/Spreadsheet/Excel/Writer/OLEwriter.php
~ /trunk/jrest/lib/Spreadsheet/Excel/Writer/Parser.php
~ /trunk/jrest/services/Cel.php
~ /trunk/jrest/services/CelImageDoublon.php
~ /trunk/jrest/services/CelMotCle.php
~ /trunk/jrest/services/CelStatistique.php
~ /trunk/jrest/services/CelStatistiqueTxt.php
~ /trunk/jrest/services/CelSyndicationObservation.php
~ /trunk/jrest/services/CelWidgetMap.php
~ /trunk/jrest/services/CelWidgetSaisie.php
x /trunk/jrest/services/CodeAsync.php
~ /trunk/jrest/services/CoordSearch.php
~ /trunk/jrest/services/InventoryImage.php
~ /trunk/jrest/services/InventoryImageExport.php
~ /trunk/jrest/services/InventoryImportExcel.php
x /trunk/jrest/services/InventoryItemList.php
+ /trunk/jrest/services/InventoryKeyWordImageLink.php
~ /trunk/jrest/services/InventoryKeyWordObsLink.php
x /trunk/jrest/services/InventoryStationList.php
x /trunk/jrest/services/NameParser.php
x /trunk/jrest/services/PlantNetRss.php
x /trunk/jrest/services/PlantNetRssParEspece.php
x /trunk/jrest/services/TestCreationDossier.php
~ /trunk/jrest/services/User.php
x /trunk/jrest/services/UserOpenId.php

Rev 628 – Modification du format des images vis à vis du nouveau ...

jpm — Tue, 08 Mar 2011 12:23:14 +0100

jpm – 3 file(s) modified
Modification du format des images vis à vis du nouveau format.

~ /trunk/jrest/services/CelImageDoublon.php
~ /trunk/jrest/services/CelSyndicationImage.php
~ /trunk/jrest/services/ImageRDF.php

Rev 551 – Amélioration.

jpm — Wed, 29 Dec 2010 19:06:21 +0100

jpm – 1 file(s) modified
Amélioration.

~ /trunk/jrest/services/CelImageDoublon.php

Rev 538 – Ajout de la gestion de l'authentification des utilisateurs.

jpm — Tue, 28 Dec 2010 15:21:50 +0100

jpm – 2 file(s) modified
Ajout de la gestion de l'authentification des utilisateurs.

~ /trunk/jrest/services/Cel.php
~ /trunk/jrest/services/CelImageDoublon.php

Rev 530 – Amélioration de l'affichage des infos sur les images en doublon.

jpm — Tue, 21 Dec 2010 16:40:57 +0100

jpm – 2 file(s) modified
Amélioration de l'affichage des infos sur les images en doublon.

~ /trunk/jrest/services/CelImageDoublon.php
~ /trunk/jrest/services/squelettes/doublon_defaut.tpl.html

Rev 526 – Amélioration affichage des infos sur les doublons.

jpm — Tue, 21 Dec 2010 09:53:35 +0100

jpm – 2 file(s) modified
Amélioration affichage des infos sur les doublons.

~ /trunk/jrest/services/CelImageDoublon.php
~ /trunk/jrest/services/squelettes/doublon_defaut.tpl.html

Rev 416 – Import des services jrest dans le dossier du carnet en ...

aurelien — Tue, 19 Oct 2010 15:00:21 +0200

aurelien – 63 file(s) modified
Import des services jrest dans le dossier du carnet en ligne

+ /trunk/jrest
+ /trunk/jrest/services
+ /trunk/jrest/services/.directory
+ /trunk/jrest/services/Cel.php
+ /trunk/jrest/services/CelDao.php
+ /trunk/jrest/services/CelImageDoublon.php
+ /trunk/jrest/services/CelStatistique.php
+ /trunk/jrest/services/CelSyndicationImage.php
+ /trunk/jrest/services/CelSyndicationObservation.php
+ /trunk/jrest/services/CelWidgetMap.php
+ /trunk/jrest/services/CodeAsync.php
+ /trunk/jrest/services/CoordSearch.php
+ /trunk/jrest/services/export
+ /trunk/jrest/services/export/.directory
+ /trunk/jrest/services/ImageContribution.php
+ /trunk/jrest/services/ImageRDF.php
+ /trunk/jrest/services/ImageRss.php
+ /trunk/jrest/services/include
+ /trunk/jrest/services/include/.directory
+ /trunk/jrest/services/include/extract_metadonnee.php
+ /trunk/jrest/services/include/stockage_fichier.php
+ /trunk/jrest/services/Inventory.php
+ /trunk/jrest/services/InventoryByDept.php
+ /trunk/jrest/services/InventoryCheck.php
+ /trunk/jrest/services/InventoryContributionList.php
+ /trunk/jrest/services/InventoryDateList.php
+ /trunk/jrest/services/InventoryExport.php
+ /trunk/jrest/services/InventoryImage.php
+ /trunk/jrest/services/InventoryImageCount.php
+ /trunk/jrest/services/InventoryImageExport.php
+ /trunk/jrest/services/InventoryImageLink.php
+ /trunk/jrest/services/InventoryImageList.php
+ /trunk/jrest/services/InventoryImport.php
+ /trunk/jrest/services/InventoryItemList.php
+ /trunk/jrest/services/InventoryKeyWordList.php
+ /trunk/jrest/services/InventoryKeyWordObsLink.php
+ /trunk/jrest/services/InventoryLocationList.php
+ /trunk/jrest/services/InventoryMaintenance.php
+ /trunk/jrest/services/InventoryObservationCount.php
+ /trunk/jrest/services/InventoryObservationList.php
+ /trunk/jrest/services/InventoryPDF.php
+ /trunk/jrest/services/InventoryStationList.php
+ /trunk/jrest/services/InventoryTransmit.php
+ /trunk/jrest/services/InventoryUserList.php
+ /trunk/jrest/services/LocationSearch.php
+ /trunk/jrest/services/Name.php
+ /trunk/jrest/services/NameImage.php
+ /trunk/jrest/services/NameMap.php
+ /trunk/jrest/services/NameSearch.php
+ /trunk/jrest/services/PlantNetRss.php
+ /trunk/jrest/services/PlantNetRssParEspece.php
+ /trunk/jrest/services/Resume.php
+ /trunk/jrest/services/squelettes
+ /trunk/jrest/services/squelettes/.directory
+ /trunk/jrest/services/squelettes/atom.tpl.xml
+ /trunk/jrest/services/squelettes/carte_defaut.tpl.html
+ /trunk/jrest/services/squelettes/doublon_defaut.tpl.html
+ /trunk/jrest/services/squelettes/markerclusterer_compiled.js
+ /trunk/jrest/services/squelettes/opml.tpl.xml
+ /trunk/jrest/services/squelettes/rss1.tpl.xml
+ /trunk/jrest/services/squelettes/rss2.tpl.xml
+ /trunk/jrest/services/User.php
+ /trunk/jrest/services/UserOpenId.php