Changeset 2710
- Timestamp:
- 03/19/13 12:40:32 (11 years ago)
- Location:
- cats/ISOcat/trunk
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
cats/ISOcat/trunk/mod-ISOcat-access-data/access/dc_check.xsl
r2379 r2710 225 225 226 226 <xsl:template match="dcif:descriptionSection/dcif:profile"> 227 <xsl:if test="$standard-flag and current()=' Private'">227 <xsl:if test="$standard-flag and current()='undecided'"> 228 228 <xsl:choose> 229 229 <xsl:when test="ancestor::dcif:dataCategory/@isocat:type='closed'"> 230 230 <xsl:call-template name="warning"> 231 <xsl:with-param name="msg">Standardized data categories can't be a member of the Privateprofile.</xsl:with-param>231 <xsl:with-param name="msg">Standardized data categories can't be a member of the 'undecided' profile.</xsl:with-param> 232 232 <xsl:with-param name="standard" select="'allow'"/> 233 233 </xsl:call-template> … … 235 235 <xsl:otherwise> 236 236 <xsl:call-template name="error"> 237 <xsl:with-param name="msg">Standardized data categories can't be a member of the Private profile.</xsl:with-param> 237 <xsl:with-param name="msg">Standardized data categories can't be a member of the 'undecided' profile.</xsl:with-param> 238 </xsl:call-template> 239 </xsl:otherwise> 240 </xsl:choose> 241 </xsl:if> 242 <xsl:if test="$standard-flag and current()='not available'"> 243 <xsl:choose> 244 <xsl:when test="ancestor::dcif:dataCategory/@isocat:type='not available'"> 245 <xsl:call-template name="warning"> 246 <xsl:with-param name="msg">Standardized data categories can't be a member of the 'not available' profile.</xsl:with-param> 247 <xsl:with-param name="standard" select="'allow'"/> 248 </xsl:call-template> 249 </xsl:when> 250 <xsl:otherwise> 251 <xsl:call-template name="error"> 252 <xsl:with-param name="msg">Standardized data categories can't be a member of the 'not available' profile.</xsl:with-param> 238 253 </xsl:call-template> 239 254 </xsl:otherwise> … … 633 648 </xsl:call-template> 634 649 </xsl:if> 635 <xsl:if test="parent::dcif:conceptualDomain[@type='closed'][exists(dcif:profile)][dcif:profile=' Private']">650 <xsl:if test="parent::dcif:conceptualDomain[@type='closed'][exists(dcif:profile)][dcif:profile='undecided']"> 636 651 <xsl:if test="not(some $p in isocat:profile satisfies exists(parent::dcif:conceptualDomain[dcif:profile=$p]))"> 637 652 <xsl:call-template name="warning"> 638 653 <xsl:with-param name="msg"> 639 <xsl:text>The Data Category contains a privateprofile specific closed value domain with a reference to the simple Data Category '</xsl:text>654 <xsl:text>The Data Category contains a 'undecided' profile specific closed value domain with a reference to the simple Data Category '</xsl:text> 640 655 <xsl:value-of select="@pid"/> 641 <xsl:text>' which is not a member of the privateprofile.</xsl:text>656 <xsl:text>' which is not a member of the 'undecided' profile.</xsl:text> 642 657 </xsl:with-param> 643 658 <xsl:with-param name="standard" select="'allow'"/> … … 645 660 </xsl:if> 646 661 </xsl:if> 647 <xsl:if test="parent::dcif:conceptualDomain[@type='closed'][exists(dcif:profile)][dcif:profile!='Private']"> 662 <xsl:if test="parent::dcif:conceptualDomain[@type='closed'][exists(dcif:profile)][dcif:profile='not available']"> 663 <xsl:if test="not(some $p in isocat:profile satisfies exists(parent::dcif:conceptualDomain[dcif:profile=$p]))"> 664 <xsl:call-template name="warning"> 665 <xsl:with-param name="msg"> 666 <xsl:text>The Data Category contains a 'not available' profile specific closed value domain with a reference to the simple Data Category '</xsl:text> 667 <xsl:value-of select="@pid"/> 668 <xsl:text>' which is not a member of the 'not available' profile.</xsl:text> 669 </xsl:with-param> 670 <xsl:with-param name="standard" select="'allow'"/> 671 </xsl:call-template> 672 </xsl:if> 673 </xsl:if> 674 <xsl:if test="parent::dcif:conceptualDomain[@type='closed'][exists(dcif:profile)][not(dcif:profile=('undecided','not available'))]"> 648 675 <xsl:if test="not(some $p in isocat:profile satisfies exists(parent::dcif:conceptualDomain[dcif:profile=$p]))"> 649 676 <xsl:call-template name="error"> … … 711 738 </xsl:if> 712 739 <xsl:choose> 713 <xsl:when test="ancestor::dcif:dataCategory/dcif:descriptionSection/dcif:profile='Private'"> 740 <xsl:when test="ancestor::dcif:dataCategory/dcif:descriptionSection/dcif:profile='undecided'"> 741 <xsl:if test="not(isocat:profile='undecided')"> 742 <xsl:call-template name="warning"> 743 <xsl:with-param name="msg"> 744 <xsl:text>The simple Data Category, which is a member of the 'undecided' profile, has an is-a relationship with a simple Data Category '</xsl:text> 745 <xsl:value-of select="@pid"/> 746 <xsl:text>' which is not a member of the 'undecided' profile.</xsl:text> 747 </xsl:with-param> 748 <xsl:with-param name="standard" select="'allow'"/> 749 </xsl:call-template> 750 </xsl:if> 751 </xsl:when> 752 <xsl:when test="ancestor::dcif:dataCategory/dcif:descriptionSection/dcif:profile='not available'"> 714 753 <xsl:if test="not(isocat:profile='Private')"> 715 754 <xsl:call-template name="warning"> 716 755 <xsl:with-param name="msg"> 717 <xsl:text>The simple Data Category, which is a member of the Privateprofile, has an is-a relationship with a simple Data Category '</xsl:text>756 <xsl:text>The simple Data Category, which is a member of the 'not available' profile, has an is-a relationship with a simple Data Category '</xsl:text> 718 757 <xsl:value-of select="@pid"/> 719 <xsl:text>' which is not a member of the Privateprofile.</xsl:text>758 <xsl:text>' which is not a member of the 'not available' profile.</xsl:text> 720 759 </xsl:with-param> 721 760 <xsl:with-param name="standard" select="'allow'"/> -
cats/ISOcat/trunk/mod-ISOcat-access-data/access/dc_sql.xsl
r2584 r2710 27 27 <xsl:choose> 28 28 <xsl:when test="$list='profile'"> 29 <xsl:variable name="val" select="if (normalize-space($value)='') then (' Private') else ($value)"/>29 <xsl:variable name="val" select="if (normalize-space($value)='') then ('undecided') else ($value)"/> 30 30 <xsl:variable name="doc" select="doc('active:ISOcat.access.data.dm.profiles')" use-when="system-property('ten60.pid')!=''"/> 31 31 <xsl:variable name="doc" select="doc('http://localhost:8080/isocat/rest/info/profiles.xml')" use-when="system-property('ten60.pid')=''"/> -
cats/ISOcat/trunk/mod-ISOcat-access-data/dbms/ISOcat-schema-init.sql
r2326 r2710 347 347 -- the default profile 348 348 349 INSERT INTO core_profile (id, name) VALUES (0, 'Private'); 349 INSERT INTO core_profile (id, name) VALUES (-1, 'not available'); 350 INSERT INTO core_profile (id, name) VALUES (0, 'undecided'); 350 351 351 352 -- an example TDG -
cats/ISOcat/trunk/mod-ISOcat-interface-gi/interface/JSXAPPS/ISOcat/components/ProfileValueDomainEditor.xml
r2288 r2710 9 9 10 10 //var profs = jsx3.xml.CDF.Document.newDocument(); 11 //profs.insertRecord({jsxid:'profile-0',jsxtext:' Private'});11 //profs.insertRecord({jsxid:'profile-0',jsxtext:'undecided'}); 12 12 //profs.insertRecord({jsxid:'profile-3',jsxtext:'Profile X'}); 13 13 //objProfileValueDomainEditor.setProfiles(profs);]]></onAfterDeserialize> -
cats/ISOcat/trunk/mod-ISOcat-interface-gi/interface/JSXAPPS/ISOcat/js/org/isocat/gui/DCEditor.js
r2656 r2710 969 969 } 970 970 971 //check if the DC is member of the private profile971 //check if the DC is member of the undecided/unavailable profile 972 972 var q = null; 973 if ((this.getProfiles().getRecord("profile-0")!=null) ) {973 if ((this.getProfiles().getRecord("profile-0")!=null) || (this.getProfiles().getRecord("profile--1")!=null)) { 974 974 // any simple DC can be linked 975 975 q = new org.isocat.data.Query(org.isocat.profile.user(),"simple",new Array()); -
cats/ISOcat/trunk/mod-ISOcat-interface-gi/interface/JSXAPPS/ISOcat/js/org/isocat/gui/ProfileValueDomainEditor.js
r2029 r2710 65 65 66 66 this.profiles = jsx3.xml.CDF.Document.newDocument(); 67 this.profiles.insertRecord({jsxid:'profile-0',jsxtext:' Private'});67 this.profiles.insertRecord({jsxid:'profile-0',jsxtext:'undecided'}); 68 68 69 69 this.setProfiles(this.profiles); … … 96 96 var rec = objMatrix.getRecordNode(strCDFKey); 97 97 var att = objColumn.getPath(); 98 if ( rec.getAttribute(att) == null) {98 if ((rec.getAttribute(att) == null) && (att != 'profile--1') && (att != 'profile-0')) { 99 99 var checkmask = objColumn.getChild(0); 100 100 checkmask.setEnabled(0); … … 203 203 org.isocat.gui.ProfileValueDomainEditor.log.info("ProfileValueDomainEditor.addValue():request preselect values"); 204 204 205 //check if the DC is member of the private profile205 //check if the DC is member of the undecided/unavailable profile 206 206 var q = null; 207 if ((this.getProfiles().getRecord("profile-0")!=null) ) {207 if ((this.getProfiles().getRecord("profile-0")!=null) || (this.getProfiles().getRecord("profile--1")!=null)) { 208 208 // any simple DC can be linked 209 209 q = new org.isocat.data.Query(org.isocat.profile.user(),"simple",new Array()); … … 244 244 var priv = profs.getRecord("profile-0"); 245 245 if (priv!=null) { 246 // add the simple DC to the privateprofile value domain246 // add the simple DC to the undecided profile value domain 247 247 rec[priv.jsxid] = '1'; 248 248 rec[priv.jsxid+"-name"] = priv.jsxtext; 249 249 org.isocat.gui.ProfileValueDomainEditor.log.info("ProfileValueDomainEditor.addValues(...):rec["+rec.jsxid+"]."+priv.jsxid+"["+rec[priv.jsxid]+"]."+priv.jsxid+"-name["+rec[priv.jsxid+"-name"]+"]"); 250 250 ins = true; 251 } else { 251 } 252 if (!ins) { 253 priv = profs.getRecord("profile--1"); 254 if (priv!=null) { 255 // add the simple DC to the uunavailable profile value domain 256 rec[priv.jsxid] = '1'; 257 rec[priv.jsxid+"-name"] = priv.jsxtext; 258 org.isocat.gui.ProfileValueDomainEditor.log.info("ProfileValueDomainEditor.addValues(...):rec["+rec.jsxid+"]."+priv.jsxid+"["+rec[priv.jsxid]+"]."+priv.jsxid+"-name["+rec[priv.jsxid+"-name"]+"]"); 259 ins = true; 260 } 261 } 262 if (!ins) { 252 263 org.isocat.gui.ProfileValueDomainEditor.log.info("ProfileValueDomainEditor.addValues(...):rec["+rec.jsxid+"] doesn't have an overlapping profile"); 253 264 org.isocat.APP.alert("Can't add this simple DC","Sorry, you can't add the simple data category /"+rec.name+"/ because it doesn't have profile overlap with this closed data category.",null,"OK"); -
cats/ISOcat/trunk/mod-ISOcat-interface-gi/interface/JSXAPPS/ISOcat/xml/dc.xml
r2630 r2710 20 20 </dcif:administrationInformationSection> 21 21 <dcif:descriptionSection> 22 <!--<dcif:profile isocat:id="0"> Private</dcif:profile>-->22 <!--<dcif:profile isocat:id="0">undecided</dcif:profile>--> 23 23 </dcif:descriptionSection> 24 24 </dcif:dataCategory> -
cats/ISOcat/trunk/mod-ISOcat-interface-gi/interface/JSXAPPS/ISOcat/xsl/DC2CDF.xsl
r2029 r2710 218 218 </xsl:choose> 219 219 </xsl:for-each> 220 <!-- special for profile-0, i.e., the Private profile: the DC might be in the private profile value domain, although it isn't a member of the private profile --> 220 <!-- special for profile- -1, i.e., the unavailable profile: the DC might be in the unavailable profile value domain, although it isn't a member of the unavailable profile --> 221 <xsl:choose> 222 <xsl:when test="isocat:profile[@isocat:id='-1']"> 223 <!-- don't do anything, handled above --> 224 <xsl:message>simple DC is a member of the 'not available' profile</xsl:message> 225 </xsl:when> 226 <xsl:when test="key('values',$val/@isocat:id)/parent::dcif:conceptualDomain[parent::dcif:dataCategory][dcif:profile/@isocat:id='-1']"> 227 <!-- part of the unavailable profile value domain --> 228 <xsl:message>simple DC is part of the 'not available' profile value domain</xsl:message> 229 <xsl:attribute name="profile--1">1</xsl:attribute> 230 <xsl:attribute name="profile--1-name"> 231 <xsl:text>not available</xsl:text> 232 </xsl:attribute> 233 <xsl:attribute name="profile--1-cd"> 234 <xsl:value-of select="key('values',$val/@isocat:id)/parent::dcif:conceptualDomain[parent::dcif:dataCategory][dcif:profile/@isocat:id='-1']/@isocat:id"/> 235 </xsl:attribute> 236 </xsl:when> 237 <!-- there is no unavailable profile value domain, and the simple DC isn't a member of the unavailable profile --> 238 </xsl:choose> 239 <!-- special for profile-0, i.e., the undecided profile: the DC might be in the undecided profile value domain, although it isn't a member of the undecided profile --> 221 240 <xsl:choose> 222 241 <xsl:when test="isocat:profile[@isocat:id='0']"> 223 242 <!-- don't do anything, handled above --> 224 <xsl:message>simple DC is a member of the Privateprofile</xsl:message>243 <xsl:message>simple DC is a member of the 'undecided' profile</xsl:message> 225 244 </xsl:when> 226 245 <xsl:when test="key('values',$val/@isocat:id)/parent::dcif:conceptualDomain[parent::dcif:dataCategory][dcif:profile/@isocat:id='0']"> 227 246 <!-- part of the private profile value domain --> 228 <xsl:message>simple DC is part of the Privateprofile value domain</xsl:message>247 <xsl:message>simple DC is part of the 'undecided' profile value domain</xsl:message> 229 248 <xsl:attribute name="profile-0">1</xsl:attribute> 230 249 <xsl:attribute name="profile-0-name"> 231 <xsl:text> Private</xsl:text>250 <xsl:text>undecided</xsl:text> 232 251 </xsl:attribute> 233 252 <xsl:attribute name="profile-0-cd"> … … 235 254 </xsl:attribute> 236 255 </xsl:when> 237 <!-- there is no private profile value domain, and the simple DC isn't a member of the privateprofile -->256 <!-- there is no undecided profile value domain, and the simple DC isn't a member of the undecided profile --> 238 257 </xsl:choose> 239 258 </record> -
cats/ISOcat/trunk/mod-ISOcat-interface-gi/interface/JSXAPPS/ISOcat/xsl/Profiles2CDF.xsl
r2635 r2710 11 11 <xsl:template match="profiles"> 12 12 <data jsxid="jsxroot"> 13 <xsl:apply-templates select="./ /profile[@isocat:id!='0']"/>14 <xsl:apply-templates select="./ /profile[@isocat:id='0']"/>13 <xsl:apply-templates select="./tdg/profile"/> 14 <xsl:apply-templates select="./profile"/> 15 15 </data> 16 16 </xsl:template> -
cats/ISOcat/trunk/mod-ISOcat-site/site/index_files/news.html
r2689 r2710 834 834 font-size:10.0pt;language:x-none;color:black'>â</span><span style='width: 835 835 12.75pt'> </span><span lang=en-US style='font-family:Verdana;language: 836 en-US'>Private is an ambiguous term in ISOcat, as a first step the Private profile is replaced by two profiles: the âundecidedâ and the ânot availableâ profiles; existing DCs which were member of the Private profile are now member of the âundecidedâ profile</span></p> 837 <p class=MsoNormal style='margin-left:54.0pt;text-indent:-18.0pt'><span 838 style='direction:ltr;unicode-bidi:embed;font-family:"Times New Roman"; 839 font-size:10.0pt;language:x-none;color:black'>â</span><span style='width: 840 12.75pt'> </span><span lang=en-US style='font-family:Verdana;language: 836 841 en-US'>fixed the binding of a Shibboleth account to an ISOcat account</span></p> 837 842 <p class=MsoNormal style='margin-left:54.0pt;text-indent:-18.0pt'><span
Note: See TracChangeset
for help on using the changeset viewer.