maltes
committed
on 24 Aug 06
Made sure the organization_id is found correctly
openacs-4/.../www/apm/bulk-install.tcl (+1 -1)
46 46 "
47 47         cd "[acs_package_root_dir $package_key]"
48 48         db_source_sql_file -ns_write "[acs_root_dir]/packages/$package_key/$file"
49 49
50 50         ns_write "</pre></blockquote>\n"
51 51     }
52 52
53 53     foreach file [apm_get_package_files -package_key $package_key -file_type java_code] {
54 54         if { !$ul_p } {
55 55             ns_write "<ul>\n"
56 56             set ul_p 1
57 57         }
58 58         ns_write "<li>Loading java code file $file...
59 59 <blockquote><pre>
60 60 "
61 61         ns_write [db_source_sqlj_file  "[acs_root_dir]/packages/$package_key/$file"]
62 62
63 63         ns_write "</pre></blockquote>\n"
64 64     }
65 65
66       if { [lsearch $enable $version_id] >= 0 } {
  66     if {$version_id in $enable} {
67 67         if { !$ul_p } {
68 68             ns_write "<ul>\n"
69 69             set ul_p 1
70 70         }
71 71         ns_write "<li>Enabling package.\n"
72 72         apm_enable_version $version_id
73 73     }
74 74
75 75     if { $ul_p } {
76 76         ns_write "</ul>\n"
77 77     }
78 78 }
79 79
80 80 #### TEMPORARY ######
81 81 # Because dependencies don't work yet, source the acs-core-ui file here.
82 82 ns_write "<li>Loading data model for ACS-Core-UI...
83 83 <blockquote><pre>
84 84 "
85 85 cd "[acs_package_root_dir acs-core-ui]"
86 86 db_source_sql_file -ns_write "[acs_root_dir]/packages/acs-core-ui/sql/acs-core-ui-create.sql"