Installed $version(package-name), version $version(name).
" + + apm_callback_and_log $callback "[lindex $operations 1] $version(package-name), version $version(name).
" } { - global errorInfo - ns_log Error "apm_package_install: Error installing $version(package-name) version $version(name): $errmsg\n$errorInfo" + ns_log Error "apm_package_install: Error installing $version(package-name) version $version(name): $errmsg\n$::errorInfo" apm_callback_and_log -severity Error $callback [subst {Failed to install $version(package-name), version $version(name). The following error was generated:
- [ad_quotehtml $errmsg] + [ns_quotehtml $errmsg]
@@ -977,9 +996,8 @@ apm_callback_and_log $callback "
Mounted an instance of the package at /${priority_mount_path}
" } { # Another package is mounted at the path so we cannot mount - global errorInfo set error_text "Package $version(package-name) could not be mounted at /$version(auto-mount) , there may already be a package mounted there, the error is: $error" - ns_log Error "apm_package_install: $error_text \n\n$errorInfo" + ns_log Error "apm_package_install: $error_text \n\n$::errorInfo" apm_callback_and_log $callback "$error_text
" } @@ -990,9 +1008,20 @@ apm_package_instance_new -instance_name $version(package-name) \ -package_key $package_key } + + + if {[file exists $::acs::rootdir/packages/$package_key/install.xml]} { + # + # Run install.xml only for new installs + # + ns_log notice "===== RUN /packages/$package_key/install.xml" + apm::process_install_xml -install_from_repository=$install_from_repository_p /packages/$package_key/install.xml "" + } + } else { # After upgrade Tcl proc callback - apm_invoke_callback_proc -version_id $version_id -type after-upgrade -arg_list [list from_version_name $upgrade_from_version_name to_version_name $version(name)] + apm_invoke_callback_proc -version_id $version_id -type after-upgrade \ + -arg_list [list from_version_name $upgrade_from_version_name to_version_name $version(name)] } # Flush the installed_p cache @@ -1004,7 +1033,7 @@ ad_proc apm_unregister_disinherited_params { package_key dependency_id } { Remove parameters for package_key that have been disinherited (i.e., the - dependency that caused them to be inherited have been removed). Called only + dependency that caused them to be inherited have been removed). Called only by the APM and keep it that way, please. } { @@ -1094,14 +1123,14 @@ # Obtain the portion of the email address before the at sign. We'll use this in the name of # the backup directory for the package. - regsub {@.+} [cc_email_from_party [ad_conn user_id]] "" my_email_name + regsub {@.+} [party::email -party_id [ad_conn user_id]] "" my_email_name - set backup_dir "[apm_workspace_dir]/$package_key-removed-$my_email_name-[ns_fmttime [ns_time] "%Y%m%d-%H:%M:%S"]" + set backup_dir "[apm_workspace_dir]/$package_key-removed-$my_email_name-[ns_fmttime [ns_time] {%Y%m%d-%H:%M:%S}]" apm_callback_and_log $callback "-" + apm_callback_and_log $callback "- Loading data model $path/$file_path...\n
\n" } elseif { $file_type eq "sqlj_code" } { if { !$ul_p } { apm_callback_and_log $callback "\n" db_source_sql_file -callback $callback $path/$file_path apm_callback_and_log $callback "\n" set ul_p 1 } - apm_callback_and_log $callback "
- Loading SQLJ code $path/$file_path... -
-" + apm_callback_and_log $callback "- Loading SQLJ code $path/$file_path...\n
\n" } elseif {$file_type eq "ctl_file"} { @@ -1291,8 +1305,7 @@ apm_callback_and_log $callback "\n" db_source_sqlj_file -callback $callback "$path/$file_path" apm_callback_and_log $callback "\n" set ul_p 1 } - apm_callback_and_log $callback "
- Loading data file $path/$file_path... -
" + apm_callback_and_log $callback "- Loading data file $path/$file_path...\n
\n" } @@ -1511,11 +1524,7 @@ } # Mark $version_id as the only installed version of the package. - db_dml version_mark_installed { - update apm_package_versions - set installed_p = decode(version_id, :version_id, 't', 'f') - where package_key = :package_key - } + db_dml version_mark_installed {} } ns_log Debug "apm_package_install_spec: Done updating .info file." } @@ -1527,13 +1536,7 @@ Enables a version of a package (disabling any other version of the package). @param version_id The id of the version to be enabled. } { - db_exec_plsql apm_package_version_enable { - begin - apm_package_version.enable( - version_id => :version_id - ); - end; - } + db_exec_plsql apm_package_version_enable {} apm_callback_and_log $callback "\n" db_load_sql_data -callback $callback $path/$file_path apm_callback_and_log $callback "Package enabled." } @@ -1543,13 +1546,7 @@ @param version_id The id of the version to be disabled. } { - db_exec_plsql apm_package_version_disable { - begin - apm_package_version.disable( - version_id => :version_id - ); - end; - } + db_exec_plsql apm_package_version_disable {} apm_callback_and_log $callback "
Package disabled." } @@ -1630,10 +1627,9 @@ $spec_file } errmsg] } { - global errorInfo apm_callback_and_log -severity Error $callback "
[string totitle $package_key] not installed.
Error: -
" +[ad_quotehtml $errmsg][ad_quotehtml $errorInfo]" } } } @@ -1642,12 +1638,7 @@ @return 1 if a version of the indicated package_key of version lower than version_name \ is already installed in the system, 0 otherwise. } { - return [db_string apm_package_upgrade_p { - select apm_package_version.version_name_greater(:version_name, version_name) upgrade_p - from apm_package_versions - where package_key = :package_key - and version_id = apm_package.highest_version (:package_key) - } -default 0] + return [db_string apm_package_upgrade_p {} -default 0] } ad_proc -private apm_package_upgrade_from { package_key version_name } { @@ -1656,13 +1647,7 @@ @return the version of the package currently installed, which we're upgrading from, if it's different from the version_name passed in. If this is not an upgrade, returns the empty string. } { - return [db_string apm_package_upgrade_from { - select version_name - from apm_package_versions - where package_key = :package_key - and version_id = apm_package.highest_version(:package_key) - and version_name != :version_name - } -default ""] + return [db_string apm_package_upgrade_from {} -default ""] } @@ -1671,12 +1656,7 @@ Upgrade a package to a locally maintained later version. } { - db_exec_plsql apm_version_upgrade { - begin - apm_package_version.upgrade(version_id => :version_id); - end; - - } + db_exec_plsql apm_version_upgrade {} } ad_proc -private apm_upgrade_for_version_p {path initial_version_name final_version_name} { @@ -1686,15 +1666,7 @@ } { ns_log Debug "apm_upgrade_for_version_p: upgrade_p $path, $initial_version_name $final_version_name" - return [db_exec_plsql apm_upgrade_for_version_p { - begin - :1 := apm_package_version.upgrade_p( - path => :path, - initial_version_name => :initial_version_name, - final_version_name => :final_version_name - ); - end; - }] + return [db_exec_plsql apm_upgrade_for_version_p {}] } ad_proc -private apm_order_upgrade_scripts {upgrade_script_names} { @@ -2037,7 +2009,7 @@ or the local file system. @param repository_url The URL for the repository channel to get from, or the empty string to - seach the local file system instead. + search the local file system instead. @param array Name of an array where you want the repository stored. It will be keyed by package-key, and each entry will be an array list list what's returned by apm_read_package_info_file. @@ -2049,11 +2021,15 @@ # This will be a list of array-lists of packages available for install upvar 1 $array repository + #ns_log notice "apm_get_package_repository repository_url=$repository_url" + apm_get_installed_versions -array installed_version if { $repository_url ne "" } { set manifest_url "${repository_url}manifest.xml" + #ns_log notice "apm_get_package_repository manifest_url=$manifest_url" + # See if we already have it in a client property set manifest [ad_get_client_property acs-admin [string range $manifest_url end-49 end]] @@ -2124,6 +2100,9 @@ [xml_node_get_attribute $dependency_node "version"]] } } + foreach install_node [xml_node_get_children_by_name $package_node "install"] { + lappend version(install) [xml_node_get_attribute $install_node "package"] + } if { ![info exists installed_version($version(package.key))] } { # Package is not installed @@ -2145,7 +2124,9 @@ } } else { # Parse spec files - foreach spec_file [apm_scan_packages "$::acs::rootdir/packages"] { + set spec_files [apm_scan_packages "$::acs::rootdir/packages"] + lappend spec_files {*}[apm_scan_packages] + foreach spec_file $spec_files { with_catch errmsg { array unset version array set version [apm_read_package_info_file $spec_file] @@ -2172,8 +2153,7 @@ } { # We don't error hard here, because we don't want the whole process to fail if there's just one # package with a bad .info file - global errorInfo - ns_log Error "apm_get_package_repository: Error while checking package info file $spec_file: $errmsg\n$errorInfo" + ns_log Error "apm_get_package_repository: Error while checking package info file $spec_file: $errmsg\n$::errorInfo" } } } @@ -2193,19 +2173,24 @@ } { set result [util::http::get -url $repository_url] set status [dict get $result status] + #ns_log notice "GOT\n$repository_url\n[dict get $result page]" if {$status != 200} { return -code error "unexpected result code $status from url $repository_url" } set repositories "" dom parse -simple -html [dict get $result page] doc $doc documentElement root - foreach node [$root selectNodes //ul/li] { - set txt [$node asText] - if {]+)\)} $txt _ name tag]} { + foreach node [$root selectNodes {//ul/li/a}] { + set href [$node getAttribute href] + if {[regexp {(\d+[-]\d+)} $href . version]} { + set name $version + set tag oacs-$version + lappend repositories [list $name $tag] + } else { + set txt [string trim [$node asText]] ns_log warning "unexpected li found in repository $repository_url: $txt" continue } - lappend repositories [list $name $tag] } return $repositories } @@ -2236,7 +2221,7 @@ # Interpolate the vars. if {$binds ne ""} { foreach {var val} $binds { - set $var [ad_quotehtml $val] + set $var [ns_quotehtml $val] } if {![info exists Id]} { set Id {$Id} @@ -2252,6 +2237,7 @@ ad_proc -public apm::process_install_xml { -nested:boolean + -install_from_repository:boolean filename binds } { process an xml install definition file which is expected to contain @@ -2299,7 +2285,7 @@ set actions [xml_node_get_children [lindex $actions 0]] foreach action $actions { - set install_proc_out [apm_invoke_install_proc -node $action] + set install_proc_out [apm_invoke_install_proc -install_from_repository=$install_from_repository_p -node $action] set out [concat $out $install_proc_out] } @@ -2310,6 +2296,7 @@ } ad_proc -private apm_invoke_install_proc { + {-install_from_repository:boolean} {-type "action"} {-node:required} } { @@ -2332,7 +2319,13 @@ } ns_log notice "apm_invoke_install_proc: call [list ::install::xml::${type}::${name} $node]" - return [::install::xml::${type}::${name} $node] + if {$install_from_repository_p && $name eq "install"} { + ns_log notice "apm_invoke_install_proc: skip [list ::install::xml::${type}::${name} $node] (install from repo)" + set result 1 + } else { + set result [::install::xml::${type}::${name} $node] + } + return $result } ############## @@ -2490,7 +2483,12 @@ set maturity_key(3) "#acs-tcl.maturity_mature_and_standard#" set maturity_key(4) "#acs-tcl.maturity_deprecated#" - set result [lang::util::localize $maturity_key($maturity)] + if {[catch { + set result [lang::util::localize $maturity_key($maturity)] + } errorMsg]} { + ns_log warning "Couldn't localize maturity key $maturity: $errorMsg" + set result $maturity + } } else { @@ -2633,9 +2631,9 @@ } } else { if {$attribute_name eq ""} { - set xml_string "${indentation}<${element_name}>[ad_quotehtml $value]\n" + set xml_string "${indentation}<${element_name}>[ns_quotehtml $value]\n" } else { - set xml_string "${indentation}<$element_name $attribute_name=\"[ad_quotehtml $value]\"/>\n" + set xml_string "${indentation}<$element_name $attribute_name=\"[ns_quotehtml $value]\"/>\n" } } return $xml_string[ns_quotehtml $errmsg][ns_quotehtml $::errorInfo]