Changeset 4785


Ignore:
Timestamp:
01/31/12 05:36:33 (4 months ago)
Author:
mattlevine
Message:

Merge branch 'master' of github.com:blueriver/MuraCMS

Location:
trunk/www
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/www/config/setup/db/oracle.sql

    r4720 r4785  
    11 
    2         CREATE SEQUENCE  "TADPLACEMENTDETAILS_DETAILID_S"  MINVALUE 1 MAXVALUE 999999999999999999999999 INCREMENT BY 1 START WITH 1 CACHE 20 NOORDER  NOCYCLE ; 
    3 --| 
    4         CREATE SEQUENCE  "TADSTATS_STATID_SEQ"  MINVALUE 1 MAXVALUE 999999999999999999999999 INCREMENT BY 1 START WITH 1 CACHE 20 NOORDER  NOCYCLE ; 
    5 --| 
    6         CREATE SEQUENCE  "TCLASSEXTENDATTRIBUTES_ATTRIBU"  MINVALUE 1 MAXVALUE 999999999999999999999999 INCREMENT BY 1 START WITH 19537201 CACHE 20 NOORDER  NOCYCLE ; 
    7 --| 
    8         CREATE SEQUENCE  "TCLASSEXTENDDATAUSERACTIVITY_D"  MINVALUE 1 MAXVALUE 999999999999999999999999 INCREMENT BY 1 START WITH 321 CACHE 20 NOORDER  NOCYCLE ; 
    9 --| 
    10    CREATE SEQUENCE  "TCLASSEXTENDDATA_DATAID_SEQ"  MINVALUE 1 MAXVALUE 999999999999999999999999 INCREMENT BY 1 START WITH 1 CACHE 20 NOORDER  NOCYCLE ; 
    11 --| 
    12    CREATE SEQUENCE  "TCONTENTTAGS_TAGID_SEQ"  MINVALUE 1 MAXVALUE 999999999999999999999999 INCREMENT BY 1 START WITH 1 CACHE 20 NOORDER  NOCYCLE ; 
    13 --| 
    14    CREATE SEQUENCE  "TCONTENT_TCONTENT_ID_SEQ"  MINVALUE 1 MAXVALUE 999999999999999999999999 INCREMENT BY 1 START WITH 221 CACHE 20 NOORDER  NOCYCLE ; 
    15 --| 
    16    CREATE SEQUENCE  "TSESSIONTRACKING_TRACKINGID_SE"  MINVALUE 1 MAXVALUE 999999999999999999999999 INCREMENT BY 1 START WITH 361 CACHE 20 NOORDER  NOCYCLE ; 
    17 --| 
    18    CREATE SEQUENCE  "TUSERSTAGS_TAGID_SEQ"  MINVALUE 1 MAXVALUE 999999999999999999999999 INCREMENT BY 1 START WITH 1 CACHE 20 NOORDER  NOCYCLE ; 
     2        CREATE SEQUENCE  "TADPLACEMENTDETAILS_DETAILID_S" MINVALUE 1 INCREMENT BY 1 START WITH 1 CACHE 20 NOORDER  NOCYCLE ; 
     3--| 
     4        CREATE SEQUENCE  "TADSTATS_STATID_SEQ" MINVALUE 1 NOMAXVALUE INCREMENT BY 1 START WITH 1 CACHE 20 NOORDER  NOCYCLE ; 
     5--| 
     6        CREATE SEQUENCE  "TCLASSEXTENDATTRIBUTES_ATTRIBU" MINVALUE 1  INCREMENT BY 1 START WITH 1 CACHE 20 NOORDER  NOCYCLE ; 
     7--| 
     8        CREATE SEQUENCE  "TCLASSEXTENDDATAUSERACTIVITY_D" MINVALUE 1 INCREMENT BY 1 START WITH 1 CACHE 20 NOORDER  NOCYCLE ; 
     9--| 
     10   CREATE SEQUENCE  "TCLASSEXTENDDATA_DATAID_SEQ" MINVALUE 1 INCREMENT BY 1 START WITH 1 CACHE 20 NOORDER  NOCYCLE ; 
     11--| 
     12   CREATE SEQUENCE  "TCONTENTTAGS_TAGID_SEQ" MINVALUE 1 INCREMENT BY 1 START WITH 1 CACHE 20 NOORDER  NOCYCLE ; 
     13--| 
     14   CREATE SEQUENCE  "TCONTENT_TCONTENT_ID_SEQ"  MINVALUE 1 INCREMENT BY 1 START WITH 1 CACHE 20 NOORDER  NOCYCLE ; 
     15--| 
     16   CREATE SEQUENCE  "TSESSIONTRACKING_TRACKINGID_SE" MINVALUE 1 INCREMENT BY 1 START WITH 1 CACHE 20 NOORDER  NOCYCLE ; 
     17--| 
     18   CREATE SEQUENCE  "TUSERSTAGS_TAGID_SEQ"  MINVALUE 1 INCREMENT BY 1 START WITH 1 CACHE 20 NOORDER  NOCYCLE ; 
    1919--| 
    2020 
    … …  
    13531353--| 
    13541354 
    1355   CREATE OR REPLACE PACKAGE "SQL_UTILITIES" AS 
    1356 identity NUMBER(10); 
    1357 END sql_utilities; 
    1358 / 
    1359 --| 
    1360  
    1361   CREATE OR REPLACE TRIGGER "TADPLACEMENTDETAILS_DETAILID_T" BEFORE INSERT OR UPDATE ON tadplacementdetails 
     1355CREATE OR REPLACE TRIGGER "TADPLACEMENTDETAILS_DETAILID_T" BEFORE INSERT ON tadplacementdetails 
    13621356FOR EACH ROW 
    1363 DECLARE  
    1364 v_newVal NUMBER(12) := 0; 
    1365 v_incval NUMBER(12) := 0; 
    13661357BEGIN 
    1367   IF INSERTING AND :new.detailID IS NULL THEN 
    1368     SELECT  tadplacementdetails_detailID_S.NEXTVAL INTO v_newVal FROM DUAL; 
    1369     IF v_newVal = 1 THEN  
    1370       SELECT max(detailID) INTO v_newVal FROM tadplacementdetails; 
    1371       v_newVal := v_newVal + 1; 
    1372       LOOP 
    1373            EXIT WHEN v_incval>=v_newVal; 
    1374            SELECT tadplacementdetails_detailID_S.nextval INTO v_incval FROM dual; 
    1375       END LOOP; 
    1376     END IF; 
    1377    sql_utilities.identity := v_newVal;  
    1378    :new.detailID := v_newVal; 
    1379   END IF; 
     1358    select tadplacementdetails_detailID_S.nextval into :new.detailID from dual; 
    13801359END; 
    13811360/ 
    … …  
    13851364--| 
    13861365 
    1387   CREATE OR REPLACE TRIGGER "TADSTATS_STATID_TRG" BEFORE INSERT OR UPDATE ON tadstats 
     1366CREATE OR REPLACE TRIGGER "TADSTATS_STATID_TRG" BEFORE INSERT ON tadstats 
    13881367FOR EACH ROW 
    1389 DECLARE  
    1390 v_newVal NUMBER(12) := 0; 
    1391 v_incval NUMBER(12) := 0; 
    13921368BEGIN 
    1393   IF INSERTING AND :new.statID IS NULL THEN 
    1394     SELECT  tadstats_statID_SEQ.NEXTVAL INTO v_newVal FROM DUAL; 
    1395     IF v_newVal = 1 THEN  
    1396       SELECT max(statID) INTO v_newVal FROM tadstats; 
    1397       v_newVal := v_newVal + 1; 
    1398       LOOP 
    1399            EXIT WHEN v_incval>=v_newVal; 
    1400            SELECT tadstats_statID_SEQ.nextval INTO v_incval FROM dual; 
    1401       END LOOP; 
    1402     END IF; 
    1403    sql_utilities.identity := v_newVal;  
    1404    :new.statID := v_newVal; 
    1405   END IF; 
     1369    select tadstats_statID_SEQ.nextval into :new.statID from dual; 
    14061370END; 
    14071371/ 
    … …  
    14111375--| 
    14121376 
    1413 CREATE OR REPLACE TRIGGER "TCLASSEXTENDATTRIBUTES_ATTRI_1" BEFORE INSERT OR UPDATE ON tclassextendattributes 
     1377CREATE OR REPLACE TRIGGER "TCLASSEXTENDATTRIBUTES_ATTRI_1" BEFORE INSERT ON tclassextendattributes 
    14141378FOR EACH ROW 
    1415 DECLARE  
    1416 v_newVal NUMBER(12) := 0; 
    1417 v_incval NUMBER(12) := 0; 
    14181379BEGIN 
    1419   IF INSERTING AND :new.attributeID IS NULL THEN 
    1420     SELECT  tclassextendattributes_attribu.NEXTVAL INTO v_newVal FROM DUAL; 
    1421     IF v_newVal = 1 THEN  
    1422       SELECT max(attributeID) INTO v_newVal FROM tclassextendattributes; 
    1423       v_newVal := v_newVal + 1; 
    1424       LOOP 
    1425            EXIT WHEN v_incval>=v_newVal; 
    1426            SELECT tclassextendattributes_attribu.nextval INTO v_incval FROM dual; 
    1427       END LOOP; 
    1428     END IF; 
    1429    sql_utilities.identity := v_newVal;  
    1430    :new.attributeID := v_newVal; 
    1431   END IF; 
     1380    select tclassextendattributes_attribu.NEXTVAL into :new.attributeID from dual; 
    14321381END; 
    14331382/ 
    … …  
    14371386--| 
    14381387 
    1439   CREATE OR REPLACE TRIGGER "TCLASSEXTENDDATAUSERACTIVITY_1" BEFORE INSERT OR UPDATE ON tclassextenddatauseractivity 
     1388CREATE OR REPLACE TRIGGER "TCLASSEXTENDDATAUSERACTIVITY_1" BEFORE INSERT ON tclassextenddatauseractivity 
    14401389FOR EACH ROW 
    1441 DECLARE  
    1442 v_newVal NUMBER(12) := 0; 
    1443 v_incval NUMBER(12) := 0; 
    14441390BEGIN 
    1445   IF INSERTING AND :new.dataID IS NULL THEN 
    1446     SELECT  tclassextenddatauseractivity_d.NEXTVAL INTO v_newVal FROM DUAL; 
    1447     IF v_newVal = 1 THEN  
    1448       SELECT max(dataID) INTO v_newVal FROM tclassextenddatauseractivity; 
    1449       v_newVal := v_newVal + 1; 
    1450       LOOP 
    1451            EXIT WHEN v_incval>=v_newVal; 
    1452            SELECT tclassextenddatauseractivity_d.nextval INTO v_incval FROM dual; 
    1453       END LOOP; 
    1454     END IF; 
    1455    sql_utilities.identity := v_newVal;  
    1456    :new.dataID := v_newVal; 
    1457   END IF; 
     1391   select tclassextenddatauseractivity_d.NEXTVAL into :new.dataID from dual; 
    14581392END; 
    14591393/ 
    … …  
    14631397--| 
    14641398 
    1465   CREATE OR REPLACE TRIGGER "TCLASSEXTENDDATA_DATAID_TRG" BEFORE INSERT OR UPDATE ON tclassextenddata 
     1399CREATE OR REPLACE TRIGGER "TCLASSEXTENDDATA_DATAID_TRG" BEFORE INSERT ON tclassextenddata 
    14661400FOR EACH ROW 
    1467 DECLARE  
    1468 v_newVal NUMBER(12) := 0; 
    1469 v_incval NUMBER(12) := 0; 
    14701401BEGIN 
    1471   IF INSERTING AND :new.dataID IS NULL THEN 
    1472     SELECT  tclassextenddata_dataID_SEQ.NEXTVAL INTO v_newVal FROM DUAL; 
    1473     IF v_newVal = 1 THEN  
    1474       SELECT max(dataID) INTO v_newVal FROM tclassextenddata; 
    1475       v_newVal := v_newVal + 1; 
    1476       LOOP 
    1477            EXIT WHEN v_incval>=v_newVal; 
    1478            SELECT tclassextenddata_dataID_SEQ.nextval INTO v_incval FROM dual; 
    1479       END LOOP; 
    1480     END IF; 
    1481    sql_utilities.identity := v_newVal;  
    1482    :new.dataID := v_newVal; 
    1483   END IF; 
     1402        select tclassextenddata_dataID_SEQ.NEXTVAL into :new.dataID from dual; 
    14841403END; 
    14851404/ 
    … …  
    14891408--| 
    14901409 
    1491   CREATE OR REPLACE TRIGGER "TCONTENTTAGS_TAGID_TRG" BEFORE INSERT OR UPDATE ON tcontenttags 
     1410CREATE OR REPLACE TRIGGER "TCONTENTTAGS_TAGID_TRG" BEFORE INSERT ON tcontenttags 
    14921411FOR EACH ROW 
    1493 DECLARE  
    1494 v_newVal NUMBER(12) := 0; 
    1495 v_incval NUMBER(12) := 0; 
    14961412BEGIN 
    1497   IF INSERTING AND :new.tagID IS NULL THEN 
    1498     SELECT  tcontenttags_tagID_SEQ.NEXTVAL INTO v_newVal FROM DUAL; 
    1499     IF v_newVal = 1 THEN  
    1500       SELECT max(tagID) INTO v_newVal FROM tcontenttags; 
    1501       v_newVal := v_newVal + 1; 
    1502       LOOP 
    1503            EXIT WHEN v_incval>=v_newVal; 
    1504            SELECT tcontenttags_tagID_SEQ.nextval INTO v_incval FROM dual; 
    1505       END LOOP; 
    1506     END IF; 
    1507    sql_utilities.identity := v_newVal;  
    1508    :new.tagID := v_newVal; 
    1509   END IF; 
     1413   select tcontenttags_tagID_SEQ.NEXTVAL into :new.tagID from dual; 
    15101414END; 
    15111415/ 
    … …  
    15151419--| 
    15161420 
    1517   CREATE OR REPLACE TRIGGER "TCONTENT_TCONTENT_ID_TRG" BEFORE INSERT OR UPDATE ON tcontent 
     1421CREATE OR REPLACE TRIGGER "TCONTENT_TCONTENT_ID_TRG" BEFORE INSERT ON tcontent 
    15181422FOR EACH ROW 
    1519 DECLARE  
    1520 v_newVal NUMBER(12) := 0; 
    1521 v_incval NUMBER(12) := 0; 
    15221423BEGIN 
    1523   IF INSERTING AND :new.TContent_ID IS NULL THEN 
    1524     SELECT  tcontent_TContent_ID_SEQ.NEXTVAL INTO v_newVal FROM DUAL; 
    1525     IF v_newVal = 1 THEN  
    1526       SELECT max(TContent_ID) INTO v_newVal FROM tcontent; 
    1527       v_newVal := v_newVal + 1; 
    1528       LOOP 
    1529            EXIT WHEN v_incval>=v_newVal; 
    1530            SELECT tcontent_TContent_ID_SEQ.nextval INTO v_incval FROM dual; 
    1531       END LOOP; 
    1532     END IF; 
    1533    sql_utilities.identity := v_newVal;  
    1534    :new.TContent_ID := v_newVal; 
    1535   END IF; 
     1424   select tcontent_tcontent_ID_SEQ.nextval into :new.TContent_ID from dual; 
    15361425END; 
    15371426/ 
    … …  
    15411430--| 
    15421431 
    1543   CREATE OR REPLACE TRIGGER "TSESSIONTRACKING_TRACKINGID_TR" BEFORE INSERT OR UPDATE ON tsessiontracking 
     1432CREATE OR REPLACE TRIGGER "TSESSIONTRACKING_TRACKINGID_TR" BEFORE INSERT ON tsessiontracking 
    15441433FOR EACH ROW 
    1545 DECLARE  
    1546 v_newVal NUMBER(12) := 0; 
    1547 v_incval NUMBER(12) := 0; 
    15481434BEGIN 
    1549   IF INSERTING AND :new.trackingID IS NULL THEN 
    1550     SELECT  tsessiontracking_trackingID_SE.NEXTVAL INTO v_newVal FROM DUAL; 
    1551     IF v_newVal = 1 THEN  
    1552       SELECT max(trackingID) INTO v_newVal FROM tsessiontracking; 
    1553       v_newVal := v_newVal + 1; 
    1554       LOOP 
    1555            EXIT WHEN v_incval>=v_newVal; 
    1556            SELECT tsessiontracking_trackingID_SE.nextval INTO v_incval FROM dual; 
    1557       END LOOP; 
    1558     END IF; 
    1559    sql_utilities.identity := v_newVal;  
    1560    :new.trackingID := v_newVal; 
    1561   END IF; 
     1435    select tsessiontracking_trackingID_SE.nextval into :new.trackingID from dual; 
    15621436END; 
    15631437/ 
    … …  
    15671441--| 
    15681442 
    1569   CREATE OR REPLACE TRIGGER "TUSERSTAGS_TAGID_TRG" BEFORE INSERT OR UPDATE ON tuserstags 
     1443CREATE OR REPLACE TRIGGER "TUSERSTAGS_TAGID_TRG" BEFORE INSERT on tuserstags  
    15701444FOR EACH ROW 
    1571 DECLARE  
    1572 v_newVal NUMBER(12) := 0; 
    1573 v_incval NUMBER(12) := 0; 
    15741445BEGIN 
    1575   IF INSERTING AND :new.tagID IS NULL THEN 
    1576     SELECT  tuserstags_tagID_SEQ.NEXTVAL INTO v_newVal FROM DUAL; 
    1577     IF v_newVal = 1 THEN  
    1578       SELECT max(tagID) INTO v_newVal FROM tuserstags; 
    1579       v_newVal := v_newVal + 1; 
    1580       LOOP 
    1581            EXIT WHEN v_incval>=v_newVal; 
    1582            SELECT tuserstags_tagID_SEQ.nextval INTO v_incval FROM dual; 
    1583       END LOOP; 
    1584     END IF; 
    1585    sql_utilities.identity := v_newVal;  
    1586    :new.tagID := v_newVal; 
    1587   END IF; 
     1446    select tuserstags_tagID_SEQ.nextval into :new.tagID from dual; 
    15881447END; 
    15891448/ 

  • trunk/www/requirements/mura/content/contentRenderer.cfc

    r4738 r4785  
    17971797        <cfset var body=arguments.str> 
    17981798        <cfset var errorStr=""> 
    1799         <cfset var regex1="(\[sava\]|\[mura\]).+?(\[/sava\]|\[/mura\])"> 
     1799        <cfset var regex1="(\${|\[sava\]|\[mura\]).+?(\[/sava\]|\[/mura\]|})"> 
    18001800        <cfset var regex2=""> 
    18011801        <cfset var finder=reFindNoCase(regex1,body,1,"true")> 
    … …  
    18101810        <cfloop condition="#finder.len[1]#"> 
    18111811                <cftry> 
    1812                         <cfset tempValue=evaluate("##" & mid(body, finder.pos[1]+6, finder.len[1]-13) & "##")> 
     1812                        <cfset tempValue=mid(body, finder.pos[1], finder.len[1])> 
     1813                        <!--- 
     1814                        <cfif left(tempValue,2) eq "${"> 
     1815                                <cfset tempValue=evaluate("##" & mid(tempValue, 3, len(tempValue)-3) & "##")> 
     1816                        <cfelse>---> 
     1817                                <cfset tempValue=evaluate("##" & mid(tempValue, 7, len(tempValue)-13) & "##")> 
     1818                        <!---</cfif>---> 
    18131819                         
    18141820                        <cfif not isDefined("tempValue") or not isSimpleValue(tempValue)> 

  • trunk/www/requirements/mura/dbUpdates/5.0.594.cfm

    r4720 r4785  
    260260 
    261261        <cfquery datasource="#getDatasource()#" username="#getDBUsername()#" password="#getDbPassword()#"> 
    262         create or replace TRIGGER "TPLUGINS_PLUGINID_TRG" BEFORE INSERT OR UPDATE ON tplugins 
     262        create or replace TRIGGER "TPLUGINS_PLUGINID_TRG" BEFORE INSERT ON tplugins 
    263263        FOR EACH ROW 
    264         DECLARE  
    265         v_newVal NUMBER(12) := 0; 
    266         v_incval NUMBER(12) := 0; 
    267264        BEGIN 
    268           IF INSERTING AND :new.pluginID IS NULL THEN 
    269265            SELECT  tplugins_pluginID_SEQ.NEXTVAL INTO v_newVal FROM DUAL; 
    270             -- If this is the first time this table have been inserted into (sequence == 1) 
    271             IF v_newVal = 1 THEN  
    272               --get the max indentity value from the table 
    273               SELECT max(pluginID) INTO v_newVal FROM tplugins; 
    274               v_newVal := v_newVal + 1; 
    275               --set the sequence to that value 
    276               LOOP 
    277                    EXIT WHEN v_incval>=v_newVal; 
    278                    SELECT tplugins_pluginID_SEQ.nextval INTO v_incval FROM dual; 
    279               END LOOP; 
    280             END IF; 
    281             -- save this to emulate @@identity 
    282            sql_utilities.identity := v_newVal;  
    283            -- assign the value from the sequence to emulate the identity column 
    284            :new.pluginID := v_newVal; 
    285           END IF; 
    286266        END; 
    287267        </cfquery> 
Note: See TracChangeset for help on using the changeset viewer.