Changeset 3164

Timestamp:

08/05/08 15:42:02 (5 years ago)

Author:

awwalter

Message:

synched with trunk update of truetime and wave pkgs

Location:

DB/branches/leap-second-dev-branch/storedprocedures

Files:

• truetime_pkg.sql (modified) (3 diffs)
• wave_pkg.sql (modified) (2 diffs)

DB/branches/leap-second-dev-branch/storedprocedures/truetime_pkg.sql

@@ -189 +189 @@
 --  ***********************************************************************/    
     FUNCTION utc2posix (utcDateStr VARCHAR2) RETURN VARCHAR2 DETERMINISTIC;
+
+
+--  /***********************************************************************
+--  * Reinitialize the package after a LEAP_SECONDS table change. 
+--  ***********************************************************************/    
+    PROCEDURE init;
 
         PRAGMA RESTRICT_REFERENCES (string2nominal,  WNDS);
@@ -211 +217 @@
         PRAGMA RESTRICT_REFERENCES (leaps2add,       WNDS);
         PRAGMA RESTRICT_REFERENCES (leaps2subtract,  WNDS);
+        PRAGMA RESTRICT_REFERENCES (init,            WNDS);
 
 END TRUETIME;
@@ -780 +787 @@
 -- Read data from Leap_Seconds table when package is 1st loaded into memory.
 -- Doing this, rather than SELECT on the table in functions speeds up code ~3x.
-
-BEGIN
 --
-  SELECT s_nominal BULK COLLECT INTO nominalSecStart from LEAP_SECONDS;  -- could do this instead of declaring cursor AWW
-  SELECT e_nominal BULK COLLECT INTO nominalSecEnd from LEAP_SECONDS;  -- ditto above AWW
-  SELECT s_true BULK COLLECT INTO trueSecStart from LEAP_SECONDS;    --  ditto above AWW
-  SELECT e_true BULK COLLECT INTO trueSecEnd from LEAP_SECONDS;    --  ditto above AWW
-  SELECT ls_count BULK COLLECT INTO leapSecs from LEAP_SECONDS;    --  ditto above AWW
-  SELECT base INTO v_pkg_base FROM EpochTimeBase WHERE offdate > SYS_EXTRACT_UTC(SYSTIMESTAMP);
+  PROCEDURE init AS
+  BEGIN
+    SELECT s_nominal BULK COLLECT INTO nominalSecStart from LEAP_SECONDS;  -- could do this instead of declaring cursor AWW
+    SELECT e_nominal BULK COLLECT INTO nominalSecEnd from LEAP_SECONDS;  -- ditto above AWW
+    SELECT s_true BULK COLLECT INTO trueSecStart from LEAP_SECONDS;    --  ditto above AWW
+    SELECT e_true BULK COLLECT INTO trueSecEnd from LEAP_SECONDS;    --  ditto above AWW
+    SELECT ls_count BULK COLLECT INTO leapSecs from LEAP_SECONDS;    --  ditto above AWW
+    SELECT base INTO v_pkg_base FROM EpochTimeBase WHERE offdate > SYS_EXTRACT_UTC(SYSTIMESTAMP);
+    --
+    --print_table_times;
+    --
+  END init;
 --
---  Replaced below with above SQL -aww
---OPEN c1;
---FETCH c1 BULK COLLECT INTO nominalSecStart;
---CLOSE c1;
-
---OPEN c2;
---FETCH c2 BULK COLLECT INTO trueSecStart;
---CLOSE c2;
-
+  PROCEDURE print_table_times AS
+  BEGIN
+    --
+    DBMS_OUTPUT.PUT_LINE('nomStart   nomEnd     trueStart  trueEnd      leapSecs');
+    --
+    FOR IDX IN 1..nominalSecStart.COUNT LOOP
+        DBMS_OUTPUT.PUT_LINE(nominalSecStart(idx) ||' '|| nominalSecEnd(idx) ||' '|| trueSecStart(idx) ||' '|| trueSecEnd(idx) ||' '|| leapSecs(idx));
+    END LOOP;
+    --
+  END print_table_times;
+--
+BEGIN
+   --
+   init;
+   --
 END TRUETIME; -- end of package
 

DB/branches/leap-second-dev-branch/storedprocedures/wave_pkg.sql

@@ -62 +62 @@
 -- ---------------------------------------------------------------------------------
 -- ---------------------------------------------------------------------------------
+-- The database stored java is the UTC version 
+  FUNCTION isJavaUTC() RETURN NUMBER;
+--
+-- ---------------------------------------------------------------------------------
+-- ---------------------------------------------------------------------------------
 END wave;
 
@@ -71 +76 @@
   --  package variable refers to requested binary data 
   -- v_blob BLOB;
+-- ---------------------------------------------------------------------------------
+-- ---------------------------------------------------------------------------------
+  FUNCTION isJavaUTC() RETURN NUMBER
+  AS LANGUAGE JAVA NAME 'org.trinet.waveserver.dc.WaveformBLOB.isVersionUTC() return int';
 -- ---------------------------------------------------------------------------------
 -- ---------------------------------------------------------------------------------