Index: openacs-4/contrib/packages/portal/portal.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/portal.info,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/packages/portal/portal.info	3 Jan 2004 01:42:57 -0000	1.4
+++ openacs-4/contrib/packages/portal/portal.info	15 Jan 2004 00:16:41 -0000	1.5
@@ -19,7 +19,10 @@
         <requires url="acs-kernel" version="4.0"/>
 
         <callbacks>
+            <callback type="after-install"  proc="portal::install::package_install"/>
+            <callback type="before-uninstall"  proc="portal::install::package_uninstall"/>
         </callbacks>
+
         <parameters>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="auto_create_user_portals"  default="0" description="If set to 1, create a portal for a user when they visit the portal package's index page.  This is turned off by default.
 "/>
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/contrib/packages/portal/sql/oracle/datasource-sc-create.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/contrib/packages/portal/sql/oracle/datasource-sc-drop.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/contrib/packages/portal/sql/postgresql/datasource-sc-create.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/contrib/packages/portal/sql/postgresql/datasource-sc-drop.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/contrib/packages/portal/tcl/apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/tcl/apm-callback-procs.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/portal/tcl/apm-callback-procs.tcl	15 Jan 2004 00:16:41 -0000	1.1
@@ -0,0 +1,85 @@
+namespace eval portal {}
+namespace eval portal::install {}
+
+ad_proc portal::install::package_install {} {
+    Package installation callback proc
+} {
+    acs_sc::contract::new_from_spec -spec {
+        name portal_datasource
+        description "Portal datasource interface."
+        operations {
+            GetMyName {
+                description {
+                    Return the name of the datasource (not to be confused with the
+                    pretty_name)
+                }
+                input {
+                }
+                output {
+                    name:string
+                }
+            } 
+            GetPrettyName {
+                description {
+                    Return the pretty name (or, for internationalized portlets, the
+                    appropriate message key) for the datasource.
+                }
+                input {
+                }
+                output {
+                    pretty_name:string
+                }
+            }
+            AddSelfToPage {
+                description {
+                    Tell the datasource to add itself to a portal page.
+
+                    DRB: This is a carryover from .LRN's new-portal package.  That early
+                    version of the portal package never called this operation, which is a
+                    good thing because none of the .LRN portlets's add_self_to_page procs
+                    matched the service contract spec!!!  But we need to define the actual
+                    procs for .LRN (whose package applets call them directly, circumventing
+                    the service contract mechanism entirely) so I'm leaving this in the spec
+                    for now.  However the portal package should actually do this task anyway
+                    so the plan is to retain this operation for .LRN but to never use it in
+                    the new version of the portal package.
+                }
+                input {
+                    page_id:integer
+                    instance_id:integer
+                    args:string
+                }
+                output {
+                    element_id:integer
+                }
+            }
+        }
+        Show {
+            description {
+                Render the portal element, returning a chunk of HTML.
+            }
+            input {
+                cf:string
+            }
+            output {
+                output:string
+            }
+        }
+        RemoveSelfFromPage {
+            description {
+                Tell the PE to remove itself from a page.
+            }
+            input {
+                page_id:integer
+                instance_id:integer
+            }
+            output {
+            }
+        }
+    }
+}
+
+ad_proc portal::install::package_uninstall {
+    acs_sc::contract::delete -name portal_datasource
+}
+
Index: openacs-4/contrib/packages/portal/tcl/portal-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/tcl/portal-procs.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/contrib/packages/portal/tcl/portal-procs.tcl	13 Jan 2004 02:23:05 -0000	1.6
+++ openacs-4/contrib/packages/portal/tcl/portal-procs.tcl	15 Jan 2004 00:16:41 -0000	1.7
@@ -491,6 +491,7 @@
                     <input type=submit name=op value=\"Remove Empty Page\">
                     </form>
                     </center>
+                    $show_html_form
                     </td>
                     </tr>"
                 }