Index: openacs-4/packages/acs-tcl/tcl/01-database-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/01-database-procs.tcl,v diff -u -r1.1.2.15 -r1.1.2.16 --- openacs-4/packages/acs-tcl/tcl/01-database-procs.tcl 13 Jul 2020 12:02:33 -0000 1.1.2.15 +++ openacs-4/packages/acs-tcl/tcl/01-database-procs.tcl 24 Aug 2020 23:50:18 -0000 1.1.2.16 @@ -3693,12 +3693,6 @@ ns_pg blob_select_file $db $content $file } else { error "invalid query" - - # TODO: Page /file-storage/download-archive/index - # fails here on cvs head both before and after my - # mult-db db_* API work, I don't know why. See bug: - # http://openacs.org/bugtracker/openacs/com/file-storage/bug?bug%5fnumber=427 - # --atp@piskorski.com, 2003/04/09 18:04 EDT } } Index: openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl,v diff -u -r1.189.2.64 -r1.189.2.65 --- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 8 Aug 2020 11:19:23 -0000 1.189.2.64 +++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 24 Aug 2020 23:50:18 -0000 1.189.2.65 @@ -980,7 +980,7 @@ } -# some procs to make it easier to deal with CSV files (reading and writing) +# Some procs to make it easier to deal with CSV files (reading and writing) # added by philg@mit.edu on October 30, 1999 ad_proc util_escape_quotes_for_csv {string} { @@ -998,8 +998,9 @@ {-override_headers {}} {-constants ""} } { - This processes a CSV of objects, taking the csv and calling package_instantiate_object - for each one. + + This processes a comma separated set of objects, taking the CSV + and calling package_instantiate_object for each one. @return a list of the created object_ids } { @@ -1075,12 +1076,12 @@ {-array_name:required} code_block } { - reads a csv and executes code block for each row in the csv. + Reads a CSV string and executes code block for each row in the CSV. - @param file the csv file to read. + @param file the CSV file to read. @param header_line the line with the list of var names - @param override_headers the list of variables in the csv - @param array_name the name of the array to set with the values from the csv as each line is read. + @param override_headers the list of variables in the CSV + @param array_name the name of the array to set with the values from the CSV as each line is read. } { # FIXME: We should catch the error here set csv_stream [open $file r] Index: openacs-4/packages/acs-tcl/tcl/test/openacs-kernel-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/test/openacs-kernel-procs.tcl,v diff -u -r1.5.2.2 -r1.5.2.3 --- openacs-4/packages/acs-tcl/tcl/test/openacs-kernel-procs.tcl 2 Sep 2019 16:47:36 -0000 1.5.2.2 +++ openacs-4/packages/acs-tcl/tcl/test/openacs-kernel-procs.tcl 24 Aug 2020 23:50:18 -0000 1.5.2.3 @@ -10,11 +10,11 @@ ad_tmpdir } \ csv_foreach { - Test block execution for rows in a csv file. + Test block execution for rows in a CSV file. } { aa_run_with_teardown -test_code { - # Create cvs file + # Create CSV file set file_loc "[ad_tmpdir]/test.csv" set file_id [open $file_loc w] puts $file_id "first_name,last_name,instrument" @@ -33,7 +33,7 @@ oacs_util::csv_foreach -file $file_loc -array_name row { lappend artist_list "$row(first_name) $row(last_name) - $row(instrument)" } - aa_equals "Getting artists from csv file" $artist_list {{Charles Mingus - Bass}\ + aa_equals "Getting artists from CSV file" $artist_list {{Charles Mingus - Bass}\ {Miles Davis - Trumpet}\ {Jhon Coltrane - Saxo}\ {Charlie Parker - Saxo}\ @@ -51,11 +51,11 @@ ad_tmpdir } \ process_objects_csv { - Test object creation for every row in a csv file. + Test object creation for every row in a CSV file. } { aa_run_with_teardown -rollback -test_code { - # Create cvs file of persons + # Create CSV file of persons set file_loc "[ad_tmpdir]/test.csv" set file_id [open $file_loc w] puts $file_id "email,first_names,last_name" Index: openacs-4/packages/xowiki/tcl/table-widget-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/table-widget-procs.tcl,v diff -u -r1.1.2.7 -r1.1.2.8 --- openacs-4/packages/xowiki/tcl/table-widget-procs.tcl 20 Aug 2020 08:53:59 -0000 1.1.2.7 +++ openacs-4/packages/xowiki/tcl/table-widget-procs.tcl 24 Aug 2020 23:51:52 -0000 1.1.2.8 @@ -279,7 +279,7 @@ # # If there are multiple includelets on a single page, # we have to identify the right one for e.g. producing the - # csv table. Therefore, we compute an includelet_key + # CSV table. Therefore, we compute an includelet_key # set includelet_key "" foreach var {:name form_item_ids form publish_states field_names unless} { Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v diff -u -r1.368.2.68 -r1.368.2.69 --- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 24 Aug 2020 11:56:01 -0000 1.368.2.68 +++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 24 Aug 2020 23:51:52 -0000 1.368.2.69 @@ -454,7 +454,7 @@ Page ad_instproc www-csv-dump {} { - This web-callable method produces a cvs dump based on the + This web-callable method produces a CSV dump based on the includelet "form-usages". } { @@ -469,7 +469,9 @@ foreach i [$items children] {array set vars [$i set instance_attributes]} array set vars [list _name 1 _last_modified 1 _creation_user 1] set attributes [lsort -dictionary [array names vars]] - # make sure, we the includelet honors the cvs generation + # + # Make sure, we the includelet honors the CSV generation + # set includelet_key name:form-usages,form_item_ids:$form_item_id,field_names:[join $attributes " "], ::xo::cc set queryparm(includelet_key) [ns_base64urlencode $includelet_key] # call the includelet