2012-03-06 Andre Heinecke * greater-pre-processing.py: - Fix bug on windows caused by a too generic path modification causing every backslash (even the ones that were intended) to be replaced by slashes. - Fix sort and join of to_id and from_id to correctly work with newer versions of GNU coreutils 2011-08-12 Andre Heinecke * upload-catchment.py: - Remove oracle option from the wizzard - Make the catchment directory selectable - Ignore empty lines in catchment.desc - Ignore empty lines in upload.list - Print exceptions on upload errors * greater-pre-processing.py: Rename to greater_pre_processing.py so that is can be used as a module * greater_pre_processing.py: Add cygwin_call function to wrap os.system calls on windows in a cygwin environment. On linux they remain to be opened with subprocess popen. - Make the code platform independent. Which mainly involved Path escaping and moving around. 2007-06-06 Frank Koormann * doc/greater-preprocessing-manual.tex, doc/howto.tex, doc/sourcefiles.tex: Uopdated documentation of features and usage of upload-catchment.py 2006-10-02 Frank Koormann * awk/generateAttTables.awk (scanBifurcations): Bugfix for #5180: Index count error on bifurcations array fixed. 2006-04-19 Jan-Oliver Wagner * awk/dsd2gen.awk: Fixing bug http://intevation.de/rt/webrt?serial_num=4210 (Discharge with Coords (0, 0) created by almost empty (just CR LF) lines) 2005-07-20 Frank Koormann * upload-catchment.py (DBPage.__init__): Adaption to common GREAT-ER dialogs, make Oracle the default DB. 2005-07-20 Frank Koormann Add background links to upload-catchment.py: * upload-catchment.py (read_catchment_desc): Read in BACKGROUND (comma seperated list) from catchment.desc (do_upload): Search backgrounds where remark matches BACKGROUNDs and insert links in backgrd_join_tab. 2005-07-20 Frank Koormann * upload-catchment.py (UploadApp.OnInit): Add wizard image. * river_aire.png: New, the wizard image. 2005-07-20 Frank Koormann Bug fix: Let the user go back to change db conn params on error. * upload-catchment.py (UploadApp.OnPageChanging): Execute DoUpload() only if page changing direction is forward. 2005-07-18 Frank Koormann * greater-pre-processing.py (do_run), awk/pic2att.awk: Fixed field seperator in pic-file preprocessing: "," is the seperator. Have been "," and ":" before. 2005-07-14 Bernhard Herzog Rework upload-catchment.py a bit and add a GUI: * upload-catchment.py (catchment_desc, read_catchment_desc): Renamed to read_catchment_desc. Raise exceptions when something goes wrong instead of returning an error code. Only print something when the new parameter "verbose" is true. (do_upload): New parameter verbose; only print something when it is true. This function is now a generator that yields progress information so that it can be shown in a progress bar. Raise exceptions when something goes wrong instead of returning an error code. (enumerate, read_lines_from_file): New. helper functions. (makePageTitle, TitledPage, DBPage, UploadPage, FinalPage) (SimpleTextPage, UploadApp): New classes/functions. This is the GUI. 2005-07-10 Frank Koormann * greater-pre-processing.py: General improvements: - Correct handling of empty lines (to be ignored) - Drop dependency on env var $(GREATER_PRE_PROC). The path to the the preprocessing an the AWK scripts is estimated from sys.argv[0]. 2005-07-10 Frank Koormann * insert-stretch_att.py: Fixed version string 2005-06-02 Frank Koormann * upload-catchment.py: Include insert-disch and insert-stretch into the tool. 2005-03-23 Jan-Oliver Wagner * doc/greater-preprocessing-manual.tex: Added CVSId and fixed python version requirement (2.2.1 instead of 2.0). 2005-02-21 Frank Koormann * upload-catchment.py: Added catchment ID handling * insert-disch_att.py (do_insert): Fixed dbinfo handling * insert-stretch_att.py (do_insert): Fixed dbinfo handling, bug in type processing 2004-12-21 Frank Koormann * greater-pre-processing.py (do_run()): Topology analysis: For large catchments the join must be called explicitly with "data sorted numerically"-flag Use GREATER_PRE_PROC-path for add-downsegments command 2004-03-22 Frank Koormann * insert-disch_att.py insert-stretch_att.py: Insert data directly using GREAT-ER DB API. 2003-12-12 Frank Koormann * upload-catchment.py: Get catchment id from database. 2003-12-02 Frank Koormann * greater-pre-processing.py (do_run(), attribute file generation): Fix bug in topology analysis: From/To relations have to be sorted numerical. * insert-disch_att.py, insert-stretch_att.py: Added database backend as a new command line option. * upload-catchment.py: New, tool for catchment processors to upload data. 2003-11-03 Jan-Oliver Wagner * catchment.thuban: Updated to use DTD of Thuban 0.9. Also added joined tables for discharge and river attributes. 2003-10-09 Jan-Oliver Wagner * greater-pre-processing.py (do_check): Added semantic check for consistent occurance of StretchID in .rna and .drn. 2003-10-06 Frank Koormann * doc/Makefile: Added extended image pre-processing for pdf. 2003-09-29 Jan-Oliver Wagner * doc/sourcefiles.tex: Pictures: clarified that only jpg-format is supported. * Howto.txt, doc/howto.tex: required Python version changed from 2.0 to 2.2.1. 2003-07-18 Thomas Koester * doc/greater-preprocessing-manual.tex: Use twoside printing with binding correction of 19mm. Added fancy headers/footers for even pages. 2003-07-17 Jan-Oliver Wagner * greater-pre-processing.py: upped version to 1.2.0. Now backgroundlst.dbf is only created for OUT-VERSION == 1.0. 2003-07-17 Jan-Oliver Wagner Final rework of the documentation for release 1.2.0. * doc/greater-preprocessing-manual.tex: updated to 1.2.0, changed titlepage and other minor stuff. Use lastpage package. * doc/howto.tex: small fixes, updated to 1.2.0. * doc/gnufdl.tex: updated to V1.2 of the license. Removed lastpage label. Added documentID. * doc/theory.tex: Added documentID. * doc/resultfiles.tex: Added documentID. Filled empty tables. Some more hints regarding GREAT-ER versions. * doc/sourcefiles.tex: Added documentID. Hint for background data. * doc/images/intevation-logo.eps: New. * doc/Makefile: Added very_clean. 2003-06-23 Jan-Oliver Wagner Added a sample catchment. New command line option 'clean' to remove all temporary and result files. * samples/: New. * samples/itter/: New. * samples/itter/ itter.bgd,itter.drn,itter.lks,itter.rna,itter.cbp, itter.dsd,itter.pic,catchment.desc: Itter catchment source files. * greater-pre-processing.py (usage_str, usage): added clean (do_run): added hint that circle-analysis can only be done for OUT-VERSION >= 2.0 (do_clean): New. 2003-05-20 Jan-Oliver Wagner Added check for circles in the topology. Added a unit test framework for the source code. * test/README, test/runtests.py, test/test_support.py: New. Environment for unit tests. * support.py: New. Support functions for pre-processing. * greater-pre-processing.py (do_run): Added check for circles in the rivernet topology. 2003-05-20 Frank Koormann * insert-disch_att.py: Fixed handling of single quotation marks in names. * insert-stretch_att.py: Fixed handling of single quotation marks in names. 2003-05-20 Jan-Oliver Wagner * Changes.txt: Added a sample command to perform the change easily 2003-05-02 Frank Koormann * insert-stretch_att.py: Fixed typo in INSERT statement * doc/howto.tex: Extended section on GREAT-ER II upload. 2003-05-02 Frank Koormann Added scripts to convert GREAT-ER I tables (disch.att, river.att) into SQL insert statements for GREAT-ER II * insert-disch_att.py: New, convert disch.att into SQL insert statements for GREAT-ER II. It is assumed that no distribution information is available for the flow, i.e flow_dist = 0. * insert-stretch_att.py: New, convert stretch.att into SQL insert statements for GREAT-ER II. The script also performs the conversion from the (mean, 5-percentile) lognormal representation used in GREAT-ER I to the standard (mean, stddev). 2003-04-14 Jan-Oliver Wagner Added a treatment for Lakes for GREAT-ER 2.0. Basically the Stretch-Type is increased by 8 in case the segment is a lake. This resolves https://intevation.de/rt/webrt?serial_num=1779. * doc/Makefile: Added resultfiles to the dependencies of the manual. * doc/theory.tex (table on Segment Types): Added hint on Lake-Types. * doc/resultfiles.tex: Added initial description of all tables. * doc/sourcefiles.tex (\section{River Network Attributes, File 'ID.rna'}): Added hint on interpretation of RealLength for Lakes (-> Volume). * doc/howto.tex: Started section on data integration into GREAT-ER 1.0 and GREAT-ER 2.0. * awk/generateAttTables.awk (writeRiverAtt): Use LAKE_CLASS instead of fixed value 2. Move determination whether it is a lake early in the procedure. Increase stretch_type by 8 in case it is a lake and OUTVERSION == 2.0. (writeRiverClassTab): Use LAKE_CLASS instead of fixed value 2. (BEGIN): Introduce LAKE_CLASS. * greater-pre-processing.py (version_str): upped version to cvs. (version_str): added option run-without-cleanup. (catchment_desc): turned comment into doc-string. (do_run): pass value of OUT-VERSION to awk-skript as OUTVERSION. Print usage when no catchment description file is found, resolves https://intevation.de/rt/webrt?serial_num=1791. 2003-02-11 Jan-Oliver Wagner * doc/theory.tex: fixed various references. 2003-02-11 Jan-Oliver Wagner * doc/sourcefiles.tex: removed a wrong sentence. 2003-02-05 Jan-Oliver Wagner * add-downsegments.py: New. * greater-pre-processing.py: Added OUT-VERSION 2.0: this adds downstream segments to the result file river.dbf Upped version to 1.1.0. * doc/howto.tex: updated version. * doc/resultfiles.tex: New. * doc/greater-preprocessing-manual.tex: Added resultsfiles.tex, upped version. 2003-02-05 Jan-Oliver Wagner * greater-pre-processing.py: Changed indenting from tab to spaces. Introduces IN-VERSION to substitute VERSION and added OUT-VERSION. * doc/sourcefiles.tex: add IN-/OUT-VERSION, add hint on IN-VERSION = 1.0 for all source files * doc/howto.tex: updated according to new catchment.desc. * doc/greater-preprocessing-manual.tex: upped version. 2002-09-26 Jan-Oliver Wagner * awk/topology.awk: replaced numeric comparison by string comparison to avoid rounding errors * greater-pre-processing.py: Add "PS" as allowed WWTP Type * awk/generateAttTables.awk: Added handling of "PS" WWTP Type (mapped to ID=10 in the wwtp.dbf) 2002-09-24 Jan-Oliver Wagner * greater-pre-processing.py: upped version to 1.0.3cvs * doc/Makefile: added .bak to the clean-up files 2002-09-24 Jan-Oliver Wagner * greater-pre-processing.py: Added option run-without-cleanup which leaves all temporary files in place. (do_run): Fixed an ugly bug for issuing the command sort. sort failed when LC_COLLATE was not set to "C". On non-english installations the processing failed. set version to 1.0.3. * Howto.txt: refined dependencies * doc/howto.tex: refined dependencies * doc/flow.final.geo.fig: removed catchment boundary name processing * doc/flow.final.att.fig: added catchment boundary name processing * doc/theory.tex: removed ArcView reference 2002-09-18 Jan-Oliver Wagner * doc: Added a full manual that describes the pre-processing. 2002-07-22 Jan-Oliver Wagner * greater-pre-processing.py: Version now 1.0.2 * greater-pre-processing.py (do_run): Added creation of file backgroundlst.dbf * started ChangeLog