Changeset 21468 in main


Ignore:
Timestamp:
09/03/20 20:48:41 (2 weeks ago)
Author:
Jill Yamashita
Message:

Updated files to add new dimensions.

Location:
adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs
Files:
9 added
234 edited
18 moved

Legend:

Unmodified
Added
Removed
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/AbusedByDate.xml

    r21383 r21468  
    503503                        <ibis:include href="section/Sex.xml"/>
    504504                        <ibis:include href="section/RaceEth.xml"/>
     505                        <ibis:include href="section/OtherDemographics.xml"/>
    505506                </SECTIONS>
    506507       
     
    525526                <ibis:include href="dimension/PrgRace.xml"/>
    526527
     528                <ibis:include href="dimension/Hispanic.xml"/>
     529                <ibis:include href="dimension/SexOrientCat.xml"/>
     530                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     531                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     532                <ibis:include href="dimension/TransgenderCat.xml"/>
     533                <ibis:include href="dimension/SexGenMinnority.xml"/>
     534
    527535        </DIMENSIONS>
    528536</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/AdultCare.xml

    r21382 r21468  
    301301                        <ibis:include href="section/Sex.xml"/>
    302302                        <ibis:include href="section/RaceEth.xml"/>
     303                        <ibis:include href="section/OtherDemographics.xml"/>
    303304                </SECTIONS>
    304305       
     
    322323                <ibis:include href="dimension/PrgRace.xml"/>
    323324
     325                <ibis:include href="dimension/Hispanic.xml"/>
     326                <ibis:include href="dimension/SexOrientCat.xml"/>
     327                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     328                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     329                <ibis:include href="dimension/TransgenderCat.xml"/>
     330                <ibis:include href="dimension/SexGenMinnority.xml"/>
     331
    324332        </DIMENSIONS>
    325333</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/AdultTalk.xml

    r21382 r21468  
    516516                        <ibis:include href="section/Sex.xml"/>
    517517                        <ibis:include href="section/RaceEth.xml"/>
     518                        <ibis:include href="section/OtherDemographics.xml"/>
    518519                </SECTIONS>
    519520       
     
    538539                <ibis:include href="dimension/PrgRace.xml"/>
    539540
     541                <ibis:include href="dimension/Hispanic.xml"/>
     542                <ibis:include href="dimension/SexOrientCat.xml"/>
     543                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     544                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     545                <ibis:include href="dimension/TransgenderCat.xml"/>
     546                <ibis:include href="dimension/SexGenMinnority.xml"/>
     547
    540548        </DIMENSIONS>
    541549</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/AlcoholAtSchool.xml

    r21151 r21468  
    526526                        <ibis:include href="section/Sex.xml"/>
    527527                        <ibis:include href="section/RaceEth.xml"/>
     528                        <ibis:include href="section/OtherDemographics.xml"/>
    528529                </SECTIONS>
    529530       
     
    550551                <ibis:include href="dimension/PrgRace.xml"/>
    551552
     553                <ibis:include href="dimension/Hispanic.xml"/>
     554                <ibis:include href="dimension/SexOrientCat.xml"/>
     555                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     556                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     557                <ibis:include href="dimension/TransgenderCat.xml"/>
     558                <ibis:include href="dimension/SexGenMinnority.xml"/>
     559
    552560        </DIMENSIONS>
    553561</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/AlcoholB413.xml

    r21382 r21468  
    526526                        <ibis:include href="section/Sex.xml"/>
    527527                        <ibis:include href="section/RaceEth.xml"/>
     528                        <ibis:include href="section/OtherDemographics.xml"/>
    528529                </SECTIONS>
    529530       
     
    549550                <ibis:include href="dimension/PrgRace.xml"/>
    550551
     552                <ibis:include href="dimension/Hispanic.xml"/>
     553                <ibis:include href="dimension/SexOrientCat.xml"/>
     554                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     555                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     556                <ibis:include href="dimension/TransgenderCat.xml"/>
     557                <ibis:include href="dimension/SexGenMinnority.xml"/>
     558
    551559        </DIMENSIONS>
    552560</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/AlcoholMarj30D.xml

    r21382 r21468  
    530530                        <ibis:include href="section/Sex.xml"/>
    531531                        <ibis:include href="section/RaceEth.xml"/>
     532                        <ibis:include href="section/OtherDemographics.xml"/>
    532533                </SECTIONS>
    533534       
     
    553554                <ibis:include href="dimension/PrgRace.xml"/>
    554555
     556                <ibis:include href="dimension/Hispanic.xml"/>
     557                <ibis:include href="dimension/SexOrientCat.xml"/>
     558                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     559                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     560                <ibis:include href="dimension/TransgenderCat.xml"/>
     561                <ibis:include href="dimension/SexGenMinnority.xml"/>
     562
    555563        </DIMENSIONS>
    556564</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/AlcoholParentsWrong.xml

    r21382 r21468  
    501501                        <ibis:include href="section/Sex.xml"/>
    502502                        <ibis:include href="section/RaceEth.xml"/>
     503                        <ibis:include href="section/OtherDemographics.xml"/>
    503504                </SECTIONS>
    504505       
     
    522523                <ibis:include href="dimension/PrgRace.xml"/>
    523524
     525                <ibis:include href="dimension/Hispanic.xml"/>
     526                <ibis:include href="dimension/SexOrientCat.xml"/>
     527                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     528                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     529                <ibis:include href="dimension/TransgenderCat.xml"/>
     530                <ibis:include href="dimension/SexGenMinnority.xml"/>
     531
    524532        </DIMENSIONS>
    525533</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/AlcoholSource7Cat.xml

    r21382 r21468  
    296296                        <ibis:include href="section/Sex.xml"/>
    297297                        <ibis:include href="section/RaceEth.xml"/>
     298                        <ibis:include href="section/OtherDemographics.xml"/>
    298299                </SECTIONS>
    299300       
     
    318319                <ibis:include href="dimension/PrgRace.xml"/>
    319320
     321                <ibis:include href="dimension/Hispanic.xml"/>
     322                <ibis:include href="dimension/SexOrientCat.xml"/>
     323                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     324                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     325                <ibis:include href="dimension/TransgenderCat.xml"/>
     326                <ibis:include href="dimension/SexGenMinnority.xml"/>
     327
    320328        </DIMENSIONS>
    321329</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/AlcoholSource7CatAny.xml

    r21382 r21468  
    325325                        <ibis:include href="section/Sex.xml"/>
    326326                        <ibis:include href="section/RaceEth.xml"/>
     327                        <ibis:include href="section/OtherDemographics.xml"/>
    327328                </SECTIONS>
    328329       
     
    347348                <ibis:include href="dimension/PrgRace.xml"/>
    348349
     350                <ibis:include href="dimension/Hispanic.xml"/>
     351                <ibis:include href="dimension/SexOrientCat.xml"/>
     352                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     353                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     354                <ibis:include href="dimension/TransgenderCat.xml"/>
     355                <ibis:include href="dimension/SexGenMinnority.xml"/>
     356
    349357        </DIMENSIONS>
    350358</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/AsthCur.xml

    r21383 r21468  
    535535                        <ibis:include href="section/Sex.xml"/>
    536536                        <ibis:include href="section/RaceEth.xml"/>
     537                        <ibis:include href="section/OtherDemographics.xml"/>
    537538                </SECTIONS>
    538539       
     
    558559                <ibis:include href="dimension/PrgRace.xml"/>
    559560
     561                <ibis:include href="dimension/Hispanic.xml"/>
     562                <ibis:include href="dimension/SexOrientCat.xml"/>
     563                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     564                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     565                <ibis:include href="dimension/TransgenderCat.xml"/>
     566                <ibis:include href="dimension/SexGenMinnority.xml"/>
     567
    560568        </DIMENSIONS>
    561569</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/AsthEver.xml

    r21383 r21468  
    534534                        <ibis:include href="section/Sex.xml"/>
    535535                        <ibis:include href="section/RaceEth.xml"/>
     536                        <ibis:include href="section/OtherDemographics.xml"/>
    536537                </SECTIONS>
    537538       
     
    556557                <ibis:include href="dimension/PrgRace.xml"/>
    557558
     559                <ibis:include href="dimension/Hispanic.xml"/>
     560                <ibis:include href="dimension/SexOrientCat.xml"/>
     561                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     562                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     563                <ibis:include href="dimension/TransgenderCat.xml"/>
     564                <ibis:include href="dimension/SexGenMinnority.xml"/>
     565
    558566        </DIMENSIONS>
    559567</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/BikeWalkToSchool.xml

    r21383 r21468  
    503503                        <ibis:include href="section/Sex.xml"/>
    504504                        <ibis:include href="section/RaceEth.xml"/>
     505                        <ibis:include href="section/OtherDemographics.xml"/>
    505506                </SECTIONS>
    506507       
     
    525526                <ibis:include href="dimension/PrgRace.xml"/>
    526527
     528                <ibis:include href="dimension/Hispanic.xml"/>
     529                <ibis:include href="dimension/SexOrientCat.xml"/>
     530                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     531                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     532                <ibis:include href="dimension/TransgenderCat.xml"/>
     533                <ibis:include href="dimension/SexGenMinnority.xml"/>
     534
    527535        </DIMENSIONS>
    528536</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/BikeWalkToSchoolDaysCat.xml

    r21383 r21468  
    479479                        <ibis:include href="section/Sex.xml"/>
    480480                        <ibis:include href="section/RaceEth.xml"/>
     481                        <ibis:include href="section/OtherDemographics.xml"/>
    481482                </SECTIONS>
    482483       
     
    500501                <ibis:include href="dimension/PrgRace.xml"/>
    501502
     503                <ibis:include href="dimension/Hispanic.xml"/>
     504                <ibis:include href="dimension/SexOrientCat.xml"/>
     505                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     506                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     507                <ibis:include href="dimension/TransgenderCat.xml"/>
     508                <ibis:include href="dimension/SexGenMinnority.xml"/>
     509
    502510        </DIMENSIONS>
    503511</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/BikeWalkToSchoolDaysCatAny.xml

    r21383 r21468  
    518518                        <ibis:include href="section/Sex.xml"/>
    519519                        <ibis:include href="section/RaceEth.xml"/>
     520                        <ibis:include href="section/OtherDemographics.xml"/>
    520521                </SECTIONS>
    521522       
     
    539540                <ibis:include href="dimension/PrgRace.xml"/>
    540541
     542                <ibis:include href="dimension/Hispanic.xml"/>
     543                <ibis:include href="dimension/SexOrientCat.xml"/>
     544                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     545                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     546                <ibis:include href="dimension/TransgenderCat.xml"/>
     547                <ibis:include href="dimension/SexGenMinnority.xml"/>
     548
    541549        </DIMENSIONS>
    542550</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/BingeDrink.xml

    r21382 r21468  
    301301                        <ibis:include href="section/Sex.xml"/>
    302302                        <ibis:include href="section/RaceEth.xml"/>
     303                        <ibis:include href="section/OtherDemographics.xml"/>
    303304                </SECTIONS>
    304305       
     
    323324                <ibis:include href="dimension/PrgRace.xml"/>
    324325
     326                <ibis:include href="dimension/Hispanic.xml"/>
     327                <ibis:include href="dimension/SexOrientCat.xml"/>
     328                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     329                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     330                <ibis:include href="dimension/TransgenderCat.xml"/>
     331                <ibis:include href="dimension/SexGenMinnority.xml"/>
     332
    325333        </DIMENSIONS>
    326334</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/BingeDrink1.xml

    r21401 r21468  
    302302                        <ibis:include href="section/Sex.xml"/>
    303303                        <ibis:include href="section/RaceEth.xml"/>
     304                        <ibis:include href="section/OtherDemographics.xml"/>
    304305                </SECTIONS>
    305306       
     
    323324                <ibis:include href="dimension/PrgRace.xml"/>
    324325
     326                <ibis:include href="dimension/Hispanic.xml"/>
     327                <ibis:include href="dimension/SexOrientCat.xml"/>
     328                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     329                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     330                <ibis:include href="dimension/TransgenderCat.xml"/>
     331                <ibis:include href="dimension/SexGenMinnority.xml"/>
     332
    325333        </DIMENSIONS>
    326334</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/BirthCntrl.xml

    r21382 r21468  
    311311                        <ibis:include href="section/Sex.xml"/>
    312312                        <ibis:include href="section/RaceEth.xml"/>
     313                        <ibis:include href="section/OtherDemographics.xml"/>
    313314                </SECTIONS>
    314315       
     
    332333                <ibis:include href="dimension/PrgRace.xml"/>
    333334
     335                <ibis:include href="dimension/Hispanic.xml"/>
     336                <ibis:include href="dimension/SexOrientCat.xml"/>
     337                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     338                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     339                <ibis:include href="dimension/TransgenderCat.xml"/>
     340                <ibis:include href="dimension/SexGenMinnority.xml"/>
     341
    334342        </DIMENSIONS>
    335343</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/BrkfstDaysEat4Cat.xml

    r21383 r21468  
    481481                        <ibis:include href="section/Sex.xml"/>
    482482                        <ibis:include href="section/RaceEth.xml"/>
     483                        <ibis:include href="section/OtherDemographics.xml"/>
    483484                </SECTIONS>
    484485       
     
    503504                <ibis:include href="dimension/PrgRace.xml"/>
    504505
     506                <ibis:include href="dimension/Hispanic.xml"/>
     507                <ibis:include href="dimension/SexOrientCat.xml"/>
     508                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     509                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     510                <ibis:include href="dimension/TransgenderCat.xml"/>
     511                <ibis:include href="dimension/SexGenMinnority.xml"/>
     512
    505513        </DIMENSIONS>
    506514</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/BrkfstDaysEat4CatAny.xml

    r21383 r21468  
    520520                        <ibis:include href="section/Sex.xml"/>
    521521                        <ibis:include href="section/RaceEth.xml"/>
     522                        <ibis:include href="section/OtherDemographics.xml"/>
    522523                </SECTIONS>
    523524       
     
    542543                <ibis:include href="dimension/PrgRace.xml"/>
    543544
     545                <ibis:include href="dimension/Hispanic.xml"/>
     546                <ibis:include href="dimension/SexOrientCat.xml"/>
     547                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     548                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     549                <ibis:include href="dimension/TransgenderCat.xml"/>
     550                <ibis:include href="dimension/SexGenMinnority.xml"/>
     551
    544552        </DIMENSIONS>
    545553</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/Bullied.xml

    r21383 r21468  
    301301                        <ibis:include href="section/Sex.xml"/>
    302302                        <ibis:include href="section/RaceEth.xml"/>
     303                        <ibis:include href="section/OtherDemographics.xml"/>
    303304                </SECTIONS>
    304305       
     
    323324                <ibis:include href="dimension/PrgRace.xml"/>
    324325
     326                <ibis:include href="dimension/Hispanic.xml"/>
     327                <ibis:include href="dimension/SexOrientCat.xml"/>
     328                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     329                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     330                <ibis:include href="dimension/TransgenderCat.xml"/>
     331                <ibis:include href="dimension/SexGenMinnority.xml"/>
     332
    325333        </DIMENSIONS>
    326334</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/Bullied12M.xml

    r21383 r21468  
    289289                        <ibis:include href="section/Sex.xml"/>
    290290                        <ibis:include href="section/RaceEth.xml"/>
     291                        <ibis:include href="section/OtherDemographics.xml"/>
    291292                </SECTIONS>
    292293       
     
    311312                <ibis:include href="dimension/PrgRace.xml"/>
    312313
     314                <ibis:include href="dimension/Hispanic.xml"/>
     315                <ibis:include href="dimension/SexOrientCat.xml"/>
     316                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     317                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     318                <ibis:include href="dimension/TransgenderCat.xml"/>
     319                <ibis:include href="dimension/SexGenMinnority.xml"/>
     320
    313321        </DIMENSIONS>
    314322</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/BullyElec.xml

    r21383 r21468  
    301301                        <ibis:include href="section/Sex.xml"/>
    302302                        <ibis:include href="section/RaceEth.xml"/>
     303                        <ibis:include href="section/OtherDemographics.xml"/>
    303304                </SECTIONS>
    304305       
     
    323324                <ibis:include href="dimension/PrgRace.xml"/>
    324325
     326                <ibis:include href="dimension/Hispanic.xml"/>
     327                <ibis:include href="dimension/SexOrientCat.xml"/>
     328                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     329                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     330                <ibis:include href="dimension/TransgenderCat.xml"/>
     331                <ibis:include href="dimension/SexGenMinnority.xml"/>
     332
    325333        </DIMENSIONS>
    326334</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/BullyElec12M.xml

    r21383 r21468  
    304304                        <ibis:include href="section/Sex.xml"/>
    305305                        <ibis:include href="section/RaceEth.xml"/>
     306                        <ibis:include href="section/OtherDemographics.xml"/>
    306307                </SECTIONS>
    307308       
     
    326327                <ibis:include href="dimension/PrgRace.xml"/>
    327328
     329                <ibis:include href="dimension/Hispanic.xml"/>
     330                <ibis:include href="dimension/SexOrientCat.xml"/>
     331                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     332                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     333                <ibis:include href="dimension/TransgenderCat.xml"/>
     334                <ibis:include href="dimension/SexGenMinnority.xml"/>
     335
    328336        </DIMENSIONS>
    329337</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/BullyElecSchoolHS.xml

    r21383 r21468  
    303303                        <ibis:include href="section/Sex.xml"/>
    304304                        <ibis:include href="section/RaceEth.xml"/>
     305                        <ibis:include href="section/OtherDemographics.xml"/>
    305306                </SECTIONS>
    306307       
     
    324325                <ibis:include href="dimension/PrgRace.xml"/>
    325326
     327                <ibis:include href="dimension/Hispanic.xml"/>
     328                <ibis:include href="dimension/SexOrientCat.xml"/>
     329                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     330                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     331                <ibis:include href="dimension/TransgenderCat.xml"/>
     332                <ibis:include href="dimension/SexGenMinnority.xml"/>
     333
    326334        </DIMENSIONS>
    327335</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/BullyElecSchoolMS.xml

    r21383 r21468  
    301301                        <ibis:include href="section/Sex.xml"/>
    302302                        <ibis:include href="section/RaceEth.xml"/>
     303                        <ibis:include href="section/OtherDemographics.xml"/>
    303304                </SECTIONS>
    304305       
     
    322323                <ibis:include href="dimension/PrgRace.xml"/>
    323324
     325                <ibis:include href="dimension/Hispanic.xml"/>
     326                <ibis:include href="dimension/SexOrientCat.xml"/>
     327                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     328                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     329                <ibis:include href="dimension/TransgenderCat.xml"/>
     330                <ibis:include href="dimension/SexGenMinnority.xml"/>
     331
    324332        </DIMENSIONS>
    325333</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/CRAFFTAll4Cat.xml

    r21382 r21468  
    491491                        <ibis:include href="section/Sex.xml"/>
    492492                        <ibis:include href="section/RaceEth.xml"/>
     493                        <ibis:include href="section/OtherDemographics.xml"/>
    493494                </SECTIONS>
    494495       
     
    514515                <ibis:include href="dimension/PrgRace.xml"/>
    515516
     517                <ibis:include href="dimension/Hispanic.xml"/>
     518                <ibis:include href="dimension/SexOrientCat.xml"/>
     519                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     520                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     521                <ibis:include href="dimension/TransgenderCat.xml"/>
     522                <ibis:include href="dimension/SexGenMinnority.xml"/>
     523
    516524        </DIMENSIONS>
    517525</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/CRAFFTAll4CatAny.xml

    r21382 r21468  
    529529                        <ibis:include href="section/Sex.xml"/>
    530530                        <ibis:include href="section/RaceEth.xml"/>
     531                        <ibis:include href="section/OtherDemographics.xml"/>
    531532                </SECTIONS>
    532533       
     
    552553                <ibis:include href="dimension/PrgRace.xml"/>
    553554
     555                <ibis:include href="dimension/Hispanic.xml"/>
     556                <ibis:include href="dimension/SexOrientCat.xml"/>
     557                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     558                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     559                <ibis:include href="dimension/TransgenderCat.xml"/>
     560                <ibis:include href="dimension/SexGenMinnority.xml"/>
     561
    554562        </DIMENSIONS>
    555563</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/CRAFFTCS4Cat.xml

    r21382 r21468  
    491491                        <ibis:include href="section/Sex.xml"/>
    492492                        <ibis:include href="section/RaceEth.xml"/>
     493                        <ibis:include href="section/OtherDemographics.xml"/>
    493494                </SECTIONS>
    494495       
     
    514515                <ibis:include href="dimension/PrgRace.xml"/>
    515516
     517                <ibis:include href="dimension/Hispanic.xml"/>
     518                <ibis:include href="dimension/SexOrientCat.xml"/>
     519                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     520                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     521                <ibis:include href="dimension/TransgenderCat.xml"/>
     522                <ibis:include href="dimension/SexGenMinnority.xml"/>
     523
    516524        </DIMENSIONS>
    517525</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/CRAFFTCS4CatAny.xml

    r21382 r21468  
    529529                        <ibis:include href="section/Sex.xml"/>
    530530                        <ibis:include href="section/RaceEth.xml"/>
     531                        <ibis:include href="section/OtherDemographics.xml"/>
    531532                </SECTIONS>
    532533       
     
    552553                <ibis:include href="dimension/PrgRace.xml"/>
    553554
     555                <ibis:include href="dimension/Hispanic.xml"/>
     556                <ibis:include href="dimension/SexOrientCat.xml"/>
     557                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     558                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     559                <ibis:include href="dimension/TransgenderCat.xml"/>
     560                <ibis:include href="dimension/SexGenMinnority.xml"/>
     561
    554562        </DIMENSIONS>
    555563</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/CensusRaceCat.xml

    r21383 r21468  
    496496                        <ibis:include href="section/GradeHS.xml"/>
    497497                        <ibis:include href="section/Sex.xml"/>
    498                         <ibis:include href="section/RaceEth.xml"/>
     498<!--                    <ibis:include href="section/RaceEth.xml"/> -->
     499                        <ibis:include href="section/OtherDemographics.xml"/>
    499500                </SECTIONS>
    500501       
     
    515516               
    516517                <ibis:include href="dimension/Sex.xml"/>
    517                 <ibis:include href="dimension/DOHRace.xml"/>
    518                 <ibis:include href="dimension/CenRace.xml"/>
    519                 <ibis:include href="dimension/PrgRace.xml"/>
     518<!--            <ibis:include href="dimension/DOHRace.xml"/> -->
     519<!--            <ibis:include href="dimension/CenRace.xml"/> -->
     520<!--            <ibis:include href="dimension/PrgRace.xml"/> -->
     521
     522                <ibis:include href="dimension/Hispanic.xml"/>
     523                <ibis:include href="dimension/SexOrientCat.xml"/>
     524                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     525                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     526                <ibis:include href="dimension/TransgenderCat.xml"/>
     527                <ibis:include href="dimension/SexGenMinnority.xml"/>
    520528
    521529        </DIMENSIONS>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/CigPuffB413.xml

    r21382 r21468  
    501501                        <ibis:include href="section/Sex.xml"/>
    502502                        <ibis:include href="section/RaceEth.xml"/>
     503                        <ibis:include href="section/OtherDemographics.xml"/>
    503504                </SECTIONS>
    504505       
     
    522523                <ibis:include href="dimension/PrgRace.xml"/>
    523524
     525                <ibis:include href="dimension/Hispanic.xml"/>
     526                <ibis:include href="dimension/SexOrientCat.xml"/>
     527                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     528                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     529                <ibis:include href="dimension/TransgenderCat.xml"/>
     530                <ibis:include href="dimension/SexGenMinnority.xml"/>
     531
    524532        </DIMENSIONS>
    525533</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/CigQuit12M.xml

    r21382 r21468  
    313313                        <ibis:include href="section/Sex.xml"/>
    314314                        <ibis:include href="section/RaceEth.xml"/>
     315                        <ibis:include href="section/OtherDemographics.xml"/>
    315316                </SECTIONS>
    316317       
     
    336337                <ibis:include href="dimension/PrgRace.xml"/>
    337338
     339                <ibis:include href="dimension/Hispanic.xml"/>
     340                <ibis:include href="dimension/SexOrientCat.xml"/>
     341                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     342                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     343                <ibis:include href="dimension/TransgenderCat.xml"/>
     344                <ibis:include href="dimension/SexGenMinnority.xml"/>
     345
    338346        </DIMENSIONS>
    339347</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/CigVaporCurr.xml

    r21382 r21468  
    501501                        <ibis:include href="section/Sex.xml"/>
    502502                        <ibis:include href="section/RaceEth.xml"/>
     503                        <ibis:include href="section/OtherDemographics.xml"/>
    503504                </SECTIONS>
    504505       
     
    522523                <ibis:include href="dimension/PrgRace.xml"/>
    523524
     525                <ibis:include href="dimension/Hispanic.xml"/>
     526                <ibis:include href="dimension/SexOrientCat.xml"/>
     527                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     528                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     529                <ibis:include href="dimension/TransgenderCat.xml"/>
     530                <ibis:include href="dimension/SexGenMinnority.xml"/>
     531
    524532        </DIMENSIONS>
    525533</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/CigWholeB413.xml

    r21382 r21468  
    535535                        <ibis:include href="section/Sex.xml"/>
    536536                        <ibis:include href="section/RaceEth.xml"/>
     537                        <ibis:include href="section/OtherDemographics.xml"/>
    537538                </SECTIONS>
    538539       
     
    558559                <ibis:include href="dimension/PrgRace.xml"/>
    559560
     561                <ibis:include href="dimension/Hispanic.xml"/>
     562                <ibis:include href="dimension/SexOrientCat.xml"/>
     563                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     564                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     565                <ibis:include href="dimension/TransgenderCat.xml"/>
     566                <ibis:include href="dimension/SexGenMinnority.xml"/>
     567
    560568        </DIMENSIONS>
    561569</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/CigsCurr.xml

    r21382 r21468  
    517517                        <ibis:include href="section/Sex.xml"/>
    518518                        <ibis:include href="section/RaceEth.xml"/>
     519                        <ibis:include href="section/OtherDemographics.xml"/>
    519520                </SECTIONS>
    520521       
     
    540541                <ibis:include href="dimension/PrgRace.xml"/>
    541542
     543                <ibis:include href="dimension/Hispanic.xml"/>
     544                <ibis:include href="dimension/SexOrientCat.xml"/>
     545                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     546                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     547                <ibis:include href="dimension/TransgenderCat.xml"/>
     548                <ibis:include href="dimension/SexGenMinnority.xml"/>
     549
    542550        </DIMENSIONS>
    543551</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/CigsEver.xml

    r21382 r21468  
    543543                        <ibis:include href="section/Sex.xml"/>
    544544                        <ibis:include href="section/RaceEth.xml"/>
     545                        <ibis:include href="section/OtherDemographics.xml"/>
    545546                </SECTIONS>
    546547       
     
    566567                <ibis:include href="dimension/PrgRace.xml"/>
    567568
     569                <ibis:include href="dimension/Hispanic.xml"/>
     570                <ibis:include href="dimension/SexOrientCat.xml"/>
     571                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     572                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     573                <ibis:include href="dimension/TransgenderCat.xml"/>
     574                <ibis:include href="dimension/SexGenMinnority.xml"/>
     575
    568576        </DIMENSIONS>
    569577</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/CigsFreq.xml

    r21382 r21468  
    531531                        <ibis:include href="section/Sex.xml"/>
    532532                        <ibis:include href="section/RaceEth.xml"/>
     533                        <ibis:include href="section/OtherDemographics.xml"/>
    533534                </SECTIONS>
    534535       
     
    554555                <ibis:include href="dimension/PrgRace.xml"/>
    555556
     557                <ibis:include href="dimension/Hispanic.xml"/>
     558                <ibis:include href="dimension/SexOrientCat.xml"/>
     559                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     560                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     561                <ibis:include href="dimension/TransgenderCat.xml"/>
     562                <ibis:include href="dimension/SexGenMinnority.xml"/>
     563
    556564        </DIMENSIONS>
    557565</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/CompleteHS5Cat.xml

    r21383 r21468  
    283283                        <ibis:include href="section/Sex.xml"/>
    284284                        <ibis:include href="section/RaceEth.xml"/>
     285                        <ibis:include href="section/OtherDemographics.xml"/>
    285286                </SECTIONS>
    286287       
     
    305306                <ibis:include href="dimension/PrgRace.xml"/>
    306307
     308                <ibis:include href="dimension/Hispanic.xml"/>
     309                <ibis:include href="dimension/SexOrientCat.xml"/>
     310                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     311                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     312                <ibis:include href="dimension/TransgenderCat.xml"/>
     313                <ibis:include href="dimension/SexGenMinnority.xml"/>
     314
    307315        </DIMENSIONS>
    308316</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/CompleteHS5CatAny.xml

    r21383 r21468  
    311311                        <ibis:include href="section/Sex.xml"/>
    312312                        <ibis:include href="section/RaceEth.xml"/>
     313                        <ibis:include href="section/OtherDemographics.xml"/>
    313314                </SECTIONS>
    314315       
     
    333334                <ibis:include href="dimension/PrgRace.xml"/>
    334335
     336                <ibis:include href="dimension/Hispanic.xml"/>
     337                <ibis:include href="dimension/SexOrientCat.xml"/>
     338                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     339                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     340                <ibis:include href="dimension/TransgenderCat.xml"/>
     341                <ibis:include href="dimension/SexGenMinnority.xml"/>
     342
    335343        </DIMENSIONS>
    336344</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/CompletePostHS5Cat.xml

    r21383 r21468  
    283283                        <ibis:include href="section/Sex.xml"/>
    284284                        <ibis:include href="section/RaceEth.xml"/>
     285                        <ibis:include href="section/OtherDemographics.xml"/>
    285286                </SECTIONS>
    286287       
     
    305306                <ibis:include href="dimension/PrgRace.xml"/>
    306307
     308                <ibis:include href="dimension/Hispanic.xml"/>
     309                <ibis:include href="dimension/SexOrientCat.xml"/>
     310                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     311                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     312                <ibis:include href="dimension/TransgenderCat.xml"/>
     313                <ibis:include href="dimension/SexGenMinnority.xml"/>
     314
    307315        </DIMENSIONS>
    308316</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/CompletePostHS5CatAny.xml

    r21383 r21468  
    315315                        <ibis:include href="section/Sex.xml"/>
    316316                        <ibis:include href="section/RaceEth.xml"/>
     317                        <ibis:include href="section/OtherDemographics.xml"/>
    317318                </SECTIONS>
    318319       
     
    337338                <ibis:include href="dimension/PrgRace.xml"/>
    338339
     340                <ibis:include href="dimension/Hispanic.xml"/>
     341                <ibis:include href="dimension/SexOrientCat.xml"/>
     342                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     343                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     344                <ibis:include href="dimension/TransgenderCat.xml"/>
     345                <ibis:include href="dimension/SexGenMinnority.xml"/>
     346
    339347        </DIMENSIONS>
    340348</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/Concussion.xml

    r21383 r21468  
    510510                        <ibis:include href="section/Sex.xml"/>
    511511                        <ibis:include href="section/RaceEth.xml"/>
     512                        <ibis:include href="section/OtherDemographics.xml"/>
    512513                </SECTIONS>
    513514       
     
    532533                <ibis:include href="dimension/PrgRace.xml"/>
    533534
     535                <ibis:include href="dimension/Hispanic.xml"/>
     536                <ibis:include href="dimension/SexOrientCat.xml"/>
     537                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     538                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     539                <ibis:include href="dimension/TransgenderCat.xml"/>
     540                <ibis:include href="dimension/SexGenMinnority.xml"/>
     541
    534542        </DIMENSIONS>
    535543</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/ConcussionCountCat.xml

    r21383 r21468  
    488488                        <ibis:include href="section/Sex.xml"/>
    489489                        <ibis:include href="section/RaceEth.xml"/>
     490                        <ibis:include href="section/OtherDemographics.xml"/>
    490491                </SECTIONS>
    491492       
     
    510511                <ibis:include href="dimension/PrgRace.xml"/>
    511512
     513                <ibis:include href="dimension/Hispanic.xml"/>
     514                <ibis:include href="dimension/SexOrientCat.xml"/>
     515                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     516                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     517                <ibis:include href="dimension/TransgenderCat.xml"/>
     518                <ibis:include href="dimension/SexGenMinnority.xml"/>
     519
    512520        </DIMENSIONS>
    513521</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/ConcussionCountCatAny.xml

    r21383 r21468  
    527527                        <ibis:include href="section/Sex.xml"/>
    528528                        <ibis:include href="section/RaceEth.xml"/>
     529                        <ibis:include href="section/OtherDemographics.xml"/>
    529530                </SECTIONS>
    530531       
     
    549550                <ibis:include href="dimension/PrgRace.xml"/>
    550551
     552                <ibis:include href="dimension/Hispanic.xml"/>
     553                <ibis:include href="dimension/SexOrientCat.xml"/>
     554                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     555                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     556                <ibis:include href="dimension/TransgenderCat.xml"/>
     557                <ibis:include href="dimension/SexGenMinnority.xml"/>
     558
    551559        </DIMENSIONS>
    552560</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/Controlled.xml

    r21383 r21468  
    512512                        <ibis:include href="section/Sex.xml"/>
    513513                        <ibis:include href="section/RaceEth.xml"/>
     514                        <ibis:include href="section/OtherDemographics.xml"/>
    514515                </SECTIONS>
    515516       
     
    535536                <ibis:include href="dimension/PrgRace.xml"/>
    536537
     538                <ibis:include href="dimension/Hispanic.xml"/>
     539                <ibis:include href="dimension/SexOrientCat.xml"/>
     540                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     541                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     542                <ibis:include href="dimension/TransgenderCat.xml"/>
     543                <ibis:include href="dimension/SexGenMinnority.xml"/>
     544
    537545        </DIMENSIONS>
    538546</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/CountyIndCat.xml

    r21345 r21468  
    275275                        <ibis:include href="section/Sex.xml"/>
    276276                        <ibis:include href="section/RaceEth.xml"/>
     277                        <ibis:include href="section/OtherDemographics.xml"/>
    277278                </SECTIONS>
    278279       
     
    297298                <ibis:include href="dimension/PrgRace.xml"/>
    298299
     300                <ibis:include href="dimension/Hispanic.xml"/>
     301                <ibis:include href="dimension/SexOrientCat.xml"/>
     302                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     303                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     304                <ibis:include href="dimension/TransgenderCat.xml"/>
     305                <ibis:include href="dimension/SexGenMinnority.xml"/>
     306
    299307        </DIMENSIONS>
    300308</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/CurAlcoholUse.xml

    r21382 r21468  
    515515                        <ibis:include href="section/Sex.xml"/>
    516516                        <ibis:include href="section/RaceEth.xml"/>
     517                        <ibis:include href="section/OtherDemographics.xml"/>
    517518                </SECTIONS>
    518519       
     
    538539                <ibis:include href="dimension/PrgRace.xml"/>
    539540
     541                <ibis:include href="dimension/Hispanic.xml"/>
     542                <ibis:include href="dimension/SexOrientCat.xml"/>
     543                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     544                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     545                <ibis:include href="dimension/TransgenderCat.xml"/>
     546                <ibis:include href="dimension/SexGenMinnority.xml"/>
     547
    540548        </DIMENSIONS>
    541549</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/DOHRaceCat.xml

    r21383 r21468  
    496496                        <ibis:include href="section/GradeHS.xml"/>
    497497                        <ibis:include href="section/Sex.xml"/>
    498                         <ibis:include href="section/RaceEth.xml"/>
     498<!--                    <ibis:include href="section/RaceEth.xml"/> -->
     499                        <ibis:include href="section/OtherDemographics.xml"/>
    499500                </SECTIONS>
    500501       
     
    515516               
    516517                <ibis:include href="dimension/Sex.xml"/>
    517                 <ibis:include href="dimension/DOHRace.xml"/>
    518                 <ibis:include href="dimension/CenRace.xml"/>
    519                 <ibis:include href="dimension/PrgRace.xml"/>
     518<!--            <ibis:include href="dimension/DOHRace.xml"/> -->
     519<!--            <ibis:include href="dimension/CenRace.xml"/> -->
     520<!--            <ibis:include href="dimension/PrgRace.xml"/> -->
     521
     522                <ibis:include href="dimension/Hispanic.xml"/>
     523                <ibis:include href="dimension/SexOrientCat.xml"/>
     524                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     525                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     526                <ibis:include href="dimension/TransgenderCat.xml"/>
     527                <ibis:include href="dimension/SexGenMinnority.xml"/>
    520528
    521529        </DIMENSIONS>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/DeprsStopAct.xml

    r21383 r21468  
    297297                        <ibis:include href="section/Sex.xml"/>
    298298                        <ibis:include href="section/RaceEth.xml"/>
     299                        <ibis:include href="section/OtherDemographics.xml"/>
    299300                </SECTIONS>
    300301       
     
    319320                <ibis:include href="dimension/PrgRace.xml"/>
    320321
     322                <ibis:include href="dimension/Hispanic.xml"/>
     323                <ibis:include href="dimension/SexOrientCat.xml"/>
     324                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     325                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     326                <ibis:include href="dimension/TransgenderCat.xml"/>
     327                <ibis:include href="dimension/SexGenMinnority.xml"/>
     328
    321329        </DIMENSIONS>
    322330</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/DeprsStopActEver.xml

    r21383 r21468  
    301301                        <ibis:include href="section/Sex.xml"/>
    302302                        <ibis:include href="section/RaceEth.xml"/>
     303                        <ibis:include href="section/OtherDemographics.xml"/>
    303304                </SECTIONS>
    304305       
     
    322323                <ibis:include href="dimension/PrgRace.xml"/>
    323324
     325                <ibis:include href="dimension/Hispanic.xml"/>
     326                <ibis:include href="dimension/SexOrientCat.xml"/>
     327                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     328                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     329                <ibis:include href="dimension/TransgenderCat.xml"/>
     330                <ibis:include href="dimension/SexGenMinnority.xml"/>
     331
    324332        </DIMENSIONS>
    325333</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/DidBullyElec12M.xml

    r21383 r21468  
    304304                        <ibis:include href="section/Sex.xml"/>
    305305                        <ibis:include href="section/RaceEth.xml"/>
     306                        <ibis:include href="section/OtherDemographics.xml"/>
    306307                </SECTIONS>
    307308       
     
    326327                <ibis:include href="dimension/PrgRace.xml"/>
    327328
     329                <ibis:include href="dimension/Hispanic.xml"/>
     330                <ibis:include href="dimension/SexOrientCat.xml"/>
     331                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     332                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     333                <ibis:include href="dimension/TransgenderCat.xml"/>
     334                <ibis:include href="dimension/SexGenMinnority.xml"/>
     335
    328336        </DIMENSIONS>
    329337</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/DidBullyElecEver.xml

    r21383 r21468  
    301301                        <ibis:include href="section/Sex.xml"/>
    302302                        <ibis:include href="section/RaceEth.xml"/>
     303                        <ibis:include href="section/OtherDemographics.xml"/>
    303304                </SECTIONS>
    304305       
     
    323324                <ibis:include href="dimension/PrgRace.xml"/>
    324325
     326                <ibis:include href="dimension/Hispanic.xml"/>
     327                <ibis:include href="dimension/SexOrientCat.xml"/>
     328                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     329                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     330                <ibis:include href="dimension/TransgenderCat.xml"/>
     331                <ibis:include href="dimension/SexGenMinnority.xml"/>
     332
    325333        </DIMENSIONS>
    326334</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/DrkJuice1Plus.xml

    r21383 r21468  
    304304                        <ibis:include href="section/Sex.xml"/>
    305305                        <ibis:include href="section/RaceEth.xml"/>
     306                        <ibis:include href="section/OtherDemographics.xml"/>
    306307                </SECTIONS>
    307308       
     
    326327                <ibis:include href="dimension/PrgRace.xml"/>
    327328
     329                <ibis:include href="dimension/Hispanic.xml"/>
     330                <ibis:include href="dimension/SexOrientCat.xml"/>
     331                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     332                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     333                <ibis:include href="dimension/TransgenderCat.xml"/>
     334                <ibis:include href="dimension/SexGenMinnority.xml"/>
     335
    328336        </DIMENSIONS>
    329337</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/DrkMilk3Plus.xml

    r21383 r21468  
    312312                        <ibis:include href="section/Sex.xml"/>
    313313                        <ibis:include href="section/RaceEth.xml"/>
     314                        <ibis:include href="section/OtherDemographics.xml"/>
    314315                </SECTIONS>
    315316       
     
    334335                <ibis:include href="dimension/PrgRace.xml"/>
    335336
     337                <ibis:include href="dimension/Hispanic.xml"/>
     338                <ibis:include href="dimension/SexOrientCat.xml"/>
     339                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     340                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     341                <ibis:include href="dimension/TransgenderCat.xml"/>
     342                <ibis:include href="dimension/SexGenMinnority.xml"/>
     343
    336344        </DIMENSIONS>
    337345</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/DrkSoda1Plus.xml

    r21383 r21468  
    312312                        <ibis:include href="section/Sex.xml"/>
    313313                        <ibis:include href="section/RaceEth.xml"/>
     314                        <ibis:include href="section/OtherDemographics.xml"/>
    314315                </SECTIONS>
    315316       
     
    334335                <ibis:include href="dimension/PrgRace.xml"/>
    335336
     337                <ibis:include href="dimension/Hispanic.xml"/>
     338                <ibis:include href="dimension/SexOrientCat.xml"/>
     339                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     340                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     341                <ibis:include href="dimension/TransgenderCat.xml"/>
     342                <ibis:include href="dimension/SexGenMinnority.xml"/>
     343
    336344        </DIMENSIONS>
    337345</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/DrugUseAtSchool.xml

    r21151 r21468  
    538538                        <ibis:include href="section/Sex.xml"/>
    539539                        <ibis:include href="section/RaceEth.xml"/>
     540                        <ibis:include href="section/OtherDemographics.xml"/>
    540541                </SECTIONS>
    541542       
     
    560561                <ibis:include href="dimension/PrgRace.xml"/>
    561562
     563                <ibis:include href="dimension/Hispanic.xml"/>
     564                <ibis:include href="dimension/SexOrientCat.xml"/>
     565                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     566                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     567                <ibis:include href="dimension/TransgenderCat.xml"/>
     568                <ibis:include href="dimension/SexGenMinnority.xml"/>
     569
    562570        </DIMENSIONS>
    563571</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/DrugUseCocaine.xml

    r21382 r21468  
    534534                        <ibis:include href="section/Sex.xml"/>
    535535                        <ibis:include href="section/RaceEth.xml"/>
     536                        <ibis:include href="section/OtherDemographics.xml"/>
    536537                </SECTIONS>
    537538       
     
    557558                <ibis:include href="dimension/PrgRace.xml"/>
    558559
     560                <ibis:include href="dimension/Hispanic.xml"/>
     561                <ibis:include href="dimension/SexOrientCat.xml"/>
     562                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     563                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     564                <ibis:include href="dimension/TransgenderCat.xml"/>
     565                <ibis:include href="dimension/SexGenMinnority.xml"/>
     566
    559567        </DIMENSIONS>
    560568</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/DrugUseEcstacy.xml

    r21382 r21468  
    534534                        <ibis:include href="section/Sex.xml"/>
    535535                        <ibis:include href="section/RaceEth.xml"/>
     536                        <ibis:include href="section/OtherDemographics.xml"/>
    536537                </SECTIONS>
    537538       
     
    557558                <ibis:include href="dimension/PrgRace.xml"/>
    558559
     560                <ibis:include href="dimension/Hispanic.xml"/>
     561                <ibis:include href="dimension/SexOrientCat.xml"/>
     562                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     563                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     564                <ibis:include href="dimension/TransgenderCat.xml"/>
     565                <ibis:include href="dimension/SexGenMinnority.xml"/>
     566
    559567        </DIMENSIONS>
    560568</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/DrugUseEver.xml

    r21382 r21468  
    303303                        <ibis:include href="section/Sex.xml"/>
    304304                        <ibis:include href="section/RaceEth.xml"/>
     305                        <ibis:include href="section/OtherDemographics.xml"/>
    305306                </SECTIONS>
    306307       
     
    324325                <ibis:include href="dimension/PrgRace.xml"/>
    325326
     327                <ibis:include href="dimension/Hispanic.xml"/>
     328                <ibis:include href="dimension/SexOrientCat.xml"/>
     329                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     330                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     331                <ibis:include href="dimension/TransgenderCat.xml"/>
     332                <ibis:include href="dimension/SexGenMinnority.xml"/>
     333
    326334        </DIMENSIONS>
    327335</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/DrugUseHallucin.xml

    r21151 r21468  
    310310                        <ibis:include href="section/Sex.xml"/>
    311311                        <ibis:include href="section/RaceEth.xml"/>
     312                        <ibis:include href="section/OtherDemographics.xml"/>
    312313                </SECTIONS>
    313314       
     
    332333                <ibis:include href="dimension/PrgRace.xml"/>
    333334
     335                <ibis:include href="dimension/Hispanic.xml"/>
     336                <ibis:include href="dimension/SexOrientCat.xml"/>
     337                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     338                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     339                <ibis:include href="dimension/TransgenderCat.xml"/>
     340                <ibis:include href="dimension/SexGenMinnority.xml"/>
     341
    334342        </DIMENSIONS>
    335343</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/DrugUseHeroin.xml

    r21382 r21468  
    310310                        <ibis:include href="section/Sex.xml"/>
    311311                        <ibis:include href="section/RaceEth.xml"/>
     312                        <ibis:include href="section/OtherDemographics.xml"/>
    312313                </SECTIONS>
    313314       
     
    332333                <ibis:include href="dimension/PrgRace.xml"/>
    333334
     335                <ibis:include href="dimension/Hispanic.xml"/>
     336                <ibis:include href="dimension/SexOrientCat.xml"/>
     337                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     338                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     339                <ibis:include href="dimension/TransgenderCat.xml"/>
     340                <ibis:include href="dimension/SexGenMinnority.xml"/>
     341
    334342        </DIMENSIONS>
    335343</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/DrugUseInhale.xml

    r21151 r21468  
    538538                        <ibis:include href="section/Sex.xml"/>
    539539                        <ibis:include href="section/RaceEth.xml"/>
     540                        <ibis:include href="section/OtherDemographics.xml"/>
    540541                </SECTIONS>
    541542       
     
    560561                <ibis:include href="dimension/PrgRace.xml"/>
    561562
     563                <ibis:include href="dimension/Hispanic.xml"/>
     564                <ibis:include href="dimension/SexOrientCat.xml"/>
     565                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     566                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     567                <ibis:include href="dimension/TransgenderCat.xml"/>
     568                <ibis:include href="dimension/SexGenMinnority.xml"/>
     569
    562570        </DIMENSIONS>
    563571</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/DrugUseInhale30.xml

    r21382 r21468  
    307307                        <ibis:include href="section/Sex.xml"/>
    308308                        <ibis:include href="section/RaceEth.xml"/>
     309                        <ibis:include href="section/OtherDemographics.xml"/>
    309310                </SECTIONS>
    310311       
     
    330331                <ibis:include href="dimension/PrgRace.xml"/>
    331332
     333                <ibis:include href="dimension/Hispanic.xml"/>
     334                <ibis:include href="dimension/SexOrientCat.xml"/>
     335                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     336                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     337                <ibis:include href="dimension/TransgenderCat.xml"/>
     338                <ibis:include href="dimension/SexGenMinnority.xml"/>
     339
    332340        </DIMENSIONS>
    333341</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/DrugUseInject.xml

    r21382 r21468  
    525525                        <ibis:include href="section/Sex.xml"/>
    526526                        <ibis:include href="section/RaceEth.xml"/>
     527                        <ibis:include href="section/OtherDemographics.xml"/>
    527528                </SECTIONS>
    528529       
     
    548549                <ibis:include href="dimension/PrgRace.xml"/>
    549550
     551                <ibis:include href="dimension/Hispanic.xml"/>
     552                <ibis:include href="dimension/SexOrientCat.xml"/>
     553                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     554                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     555                <ibis:include href="dimension/TransgenderCat.xml"/>
     556                <ibis:include href="dimension/SexGenMinnority.xml"/>
     557
    550558        </DIMENSIONS>
    551559</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/DrugUseMarj30.xml

    r21382 r21468  
    515515                        <ibis:include href="section/Sex.xml"/>
    516516                        <ibis:include href="section/RaceEth.xml"/>
     517                        <ibis:include href="section/OtherDemographics.xml"/>
    517518                </SECTIONS>
    518519       
     
    538539                <ibis:include href="dimension/PrgRace.xml"/>
    539540
     541                <ibis:include href="dimension/Hispanic.xml"/>
     542                <ibis:include href="dimension/SexOrientCat.xml"/>
     543                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     544                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     545                <ibis:include href="dimension/TransgenderCat.xml"/>
     546                <ibis:include href="dimension/SexGenMinnority.xml"/>
     547
    540548        </DIMENSIONS>
    541549</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/DrugUseMarjB413.xml

    r21382 r21468  
    518518                        <ibis:include href="section/Sex.xml"/>
    519519                        <ibis:include href="section/RaceEth.xml"/>
     520                        <ibis:include href="section/OtherDemographics.xml"/>
    520521                </SECTIONS>
    521522       
     
    540541                <ibis:include href="dimension/PrgRace.xml"/>
    541542
     543                <ibis:include href="dimension/Hispanic.xml"/>
     544                <ibis:include href="dimension/SexOrientCat.xml"/>
     545                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     546                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     547                <ibis:include href="dimension/TransgenderCat.xml"/>
     548                <ibis:include href="dimension/SexGenMinnority.xml"/>
     549
    542550        </DIMENSIONS>
    543551</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/DrugUseMarjEver.xml

    r21382 r21468  
    533533                        <ibis:include href="section/Sex.xml"/>
    534534                        <ibis:include href="section/RaceEth.xml"/>
     535                        <ibis:include href="section/OtherDemographics.xml"/>
    535536                </SECTIONS>
    536537       
     
    556557                <ibis:include href="dimension/PrgRace.xml"/>
    557558
     559                <ibis:include href="dimension/Hispanic.xml"/>
     560                <ibis:include href="dimension/SexOrientCat.xml"/>
     561                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     562                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     563                <ibis:include href="dimension/TransgenderCat.xml"/>
     564                <ibis:include href="dimension/SexGenMinnority.xml"/>
     565
    558566        </DIMENSIONS>
    559567</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/DrugUseMarjHow30Cat.xml

    r21382 r21468  
    287287                        <ibis:include href="section/Sex.xml"/>
    288288                        <ibis:include href="section/RaceEth.xml"/>
     289                        <ibis:include href="section/OtherDemographics.xml"/>
    289290                </SECTIONS>
    290291       
     
    309310                <ibis:include href="dimension/PrgRace.xml"/>
    310311
     312                <ibis:include href="dimension/Hispanic.xml"/>
     313                <ibis:include href="dimension/SexOrientCat.xml"/>
     314                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     315                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     316                <ibis:include href="dimension/TransgenderCat.xml"/>
     317                <ibis:include href="dimension/SexGenMinnority.xml"/>
     318
    311319        </DIMENSIONS>
    312320</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/DrugUseMarjHow30CatAny.xml

    r21382 r21468  
    317317                        <ibis:include href="section/Sex.xml"/>
    318318                        <ibis:include href="section/RaceEth.xml"/>
     319                        <ibis:include href="section/OtherDemographics.xml"/>
    319320                </SECTIONS>
    320321       
     
    339340                <ibis:include href="dimension/PrgRace.xml"/>
    340341
     342                <ibis:include href="dimension/Hispanic.xml"/>
     343                <ibis:include href="dimension/SexOrientCat.xml"/>
     344                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     345                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     346                <ibis:include href="dimension/TransgenderCat.xml"/>
     347                <ibis:include href="dimension/SexGenMinnority.xml"/>
     348
    341349        </DIMENSIONS>
    342350</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/DrugUseMarjSchool30.xml

    r21151 r21468  
    526526                        <ibis:include href="section/Sex.xml"/>
    527527                        <ibis:include href="section/RaceEth.xml"/>
     528                        <ibis:include href="section/OtherDemographics.xml"/>
    528529                </SECTIONS>
    529530       
     
    550551                <ibis:include href="dimension/PrgRace.xml"/>
    551552
     553                <ibis:include href="dimension/Hispanic.xml"/>
     554                <ibis:include href="dimension/SexOrientCat.xml"/>
     555                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     556                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     557                <ibis:include href="dimension/TransgenderCat.xml"/>
     558                <ibis:include href="dimension/SexGenMinnority.xml"/>
     559
    552560        </DIMENSIONS>
    553561</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/DrugUseMarjSynth.xml

    r21151 r21468  
    538538                        <ibis:include href="section/Sex.xml"/>
    539539                        <ibis:include href="section/RaceEth.xml"/>
     540                        <ibis:include href="section/OtherDemographics.xml"/>
    540541                </SECTIONS>
    541542       
     
    559560                <ibis:include href="dimension/PrgRace.xml"/>
    560561
     562                <ibis:include href="dimension/Hispanic.xml"/>
     563                <ibis:include href="dimension/SexOrientCat.xml"/>
     564                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     565                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     566                <ibis:include href="dimension/TransgenderCat.xml"/>
     567                <ibis:include href="dimension/SexGenMinnority.xml"/>
     568
    561569        </DIMENSIONS>
    562570</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/DrugUseMeth.xml

    r21382 r21468  
    531531                        <ibis:include href="section/Sex.xml"/>
    532532                        <ibis:include href="section/RaceEth.xml"/>
     533                        <ibis:include href="section/OtherDemographics.xml"/>
    533534                </SECTIONS>
    534535       
     
    554555                <ibis:include href="dimension/PrgRace.xml"/>
    555556
     557                <ibis:include href="dimension/Hispanic.xml"/>
     558                <ibis:include href="dimension/SexOrientCat.xml"/>
     559                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     560                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     561                <ibis:include href="dimension/TransgenderCat.xml"/>
     562                <ibis:include href="dimension/SexGenMinnority.xml"/>
     563
    556564        </DIMENSIONS>
    557565</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/DrugUseRXEver.xml

    r21382 r21468  
    517517                        <ibis:include href="section/Sex.xml"/>
    518518                        <ibis:include href="section/RaceEth.xml"/>
     519                        <ibis:include href="section/OtherDemographics.xml"/>
    519520                </SECTIONS>
    520521       
     
    541542                <ibis:include href="dimension/PrgRace.xml"/>
    542543
     544                <ibis:include href="dimension/Hispanic.xml"/>
     545                <ibis:include href="dimension/SexOrientCat.xml"/>
     546                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     547                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     548                <ibis:include href="dimension/TransgenderCat.xml"/>
     549                <ibis:include href="dimension/SexGenMinnority.xml"/>
     550
    543551        </DIMENSIONS>
    544552</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/DrugUseRXPainEver.xml

    r21382 r21468  
    501501                        <ibis:include href="section/Sex.xml"/>
    502502                        <ibis:include href="section/RaceEth.xml"/>
     503                        <ibis:include href="section/OtherDemographics.xml"/>
    503504                </SECTIONS>
    504505       
     
    522523                <ibis:include href="dimension/PrgRace.xml"/>
    523524
     525                <ibis:include href="dimension/Hispanic.xml"/>
     526                <ibis:include href="dimension/SexOrientCat.xml"/>
     527                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     528                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     529                <ibis:include href="dimension/TransgenderCat.xml"/>
     530                <ibis:include href="dimension/SexGenMinnority.xml"/>
     531
    524532        </DIMENSIONS>
    525533</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/Eat2Fruit.xml

    r21383 r21468  
    312312                        <ibis:include href="section/Sex.xml"/>
    313313                        <ibis:include href="section/RaceEth.xml"/>
     314                        <ibis:include href="section/OtherDemographics.xml"/>
    314315                </SECTIONS>
    315316       
     
    334335                <ibis:include href="dimension/PrgRace.xml"/>
    335336
     337                <ibis:include href="dimension/Hispanic.xml"/>
     338                <ibis:include href="dimension/SexOrientCat.xml"/>
     339                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     340                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     341                <ibis:include href="dimension/TransgenderCat.xml"/>
     342                <ibis:include href="dimension/SexGenMinnority.xml"/>
     343
    336344        </DIMENSIONS>
    337345</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/Eat3Veg.xml

    r21383 r21468  
    312312                        <ibis:include href="section/Sex.xml"/>
    313313                        <ibis:include href="section/RaceEth.xml"/>
     314                        <ibis:include href="section/OtherDemographics.xml"/>
    314315                </SECTIONS>
    315316       
     
    334335                <ibis:include href="dimension/PrgRace.xml"/>
    335336
     337                <ibis:include href="dimension/Hispanic.xml"/>
     338                <ibis:include href="dimension/SexOrientCat.xml"/>
     339                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     340                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     341                <ibis:include href="dimension/TransgenderCat.xml"/>
     342                <ibis:include href="dimension/SexGenMinnority.xml"/>
     343
    336344        </DIMENSIONS>
    337345</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/EverAlcoholUse.xml

    r21382 r21468  
    516516                        <ibis:include href="section/Sex.xml"/>
    517517                        <ibis:include href="section/RaceEth.xml"/>
     518                        <ibis:include href="section/OtherDemographics.xml"/>
    518519                </SECTIONS>
    519520       
     
    537538                <ibis:include href="dimension/PrgRace.xml"/>
    538539
     540                <ibis:include href="dimension/Hispanic.xml"/>
     541                <ibis:include href="dimension/SexOrientCat.xml"/>
     542                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     543                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     544                <ibis:include href="dimension/TransgenderCat.xml"/>
     545                <ibis:include href="dimension/SexGenMinnority.xml"/>
     546
    539547        </DIMENSIONS>
    540548</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/Fight.xml

    r21383 r21468  
    523523                        <ibis:include href="section/Sex.xml"/>
    524524                        <ibis:include href="section/RaceEth.xml"/>
     525                        <ibis:include href="section/OtherDemographics.xml"/>
    525526                </SECTIONS>
    526527       
     
    546547                <ibis:include href="dimension/PrgRace.xml"/>
    547548
     549                <ibis:include href="dimension/Hispanic.xml"/>
     550                <ibis:include href="dimension/SexOrientCat.xml"/>
     551                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     552                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     553                <ibis:include href="dimension/TransgenderCat.xml"/>
     554                <ibis:include href="dimension/SexGenMinnority.xml"/>
     555
    548556        </DIMENSIONS>
    549557</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/FightInjTreat.xml

    r21383 r21468  
    539539                        <ibis:include href="section/Sex.xml"/>
    540540                        <ibis:include href="section/RaceEth.xml"/>
     541                        <ibis:include href="section/OtherDemographics.xml"/>
    541542                </SECTIONS>
    542543       
     
    563564                <ibis:include href="dimension/PrgRace.xml"/>
    564565
     566                <ibis:include href="dimension/Hispanic.xml"/>
     567                <ibis:include href="dimension/SexOrientCat.xml"/>
     568                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     569                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     570                <ibis:include href="dimension/TransgenderCat.xml"/>
     571                <ibis:include href="dimension/SexGenMinnority.xml"/>
     572
    565573        </DIMENSIONS>
    566574</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/FruitNVeg3Plus7D.xml

    r21383 r21468  
    311311                        <ibis:include href="section/Sex.xml"/>
    312312                        <ibis:include href="section/RaceEth.xml"/>
     313                        <ibis:include href="section/OtherDemographics.xml"/>
    313314                </SECTIONS>
    314315       
     
    332333                <ibis:include href="dimension/PrgRace.xml"/>
    333334
     335                <ibis:include href="dimension/Hispanic.xml"/>
     336                <ibis:include href="dimension/SexOrientCat.xml"/>
     337                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     338                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     339                <ibis:include href="dimension/TransgenderCat.xml"/>
     340                <ibis:include href="dimension/SexGenMinnority.xml"/>
     341
    334342        </DIMENSIONS>
    335343</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/FruitNVeg7D.xml

    r21383 r21468  
    312312                        <ibis:include href="section/Sex.xml"/>
    313313                        <ibis:include href="section/RaceEth.xml"/>
     314                        <ibis:include href="section/OtherDemographics.xml"/>
    314315                </SECTIONS>
    315316       
     
    334335                <ibis:include href="dimension/PrgRace.xml"/>
    335336
     337                <ibis:include href="dimension/Hispanic.xml"/>
     338                <ibis:include href="dimension/SexOrientCat.xml"/>
     339                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     340                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     341                <ibis:include href="dimension/TransgenderCat.xml"/>
     342                <ibis:include href="dimension/SexGenMinnority.xml"/>
     343
    336344        </DIMENSIONS>
    337345</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/GenderIndCat.xml

    r21383 r21468  
    349349                                        </DIMENSION_NAMES>
    350350                                        <SECTION_NAMES>
    351                                                 <SECTION_NAME>GradeMS</SECTION_NAME>
     351                                                <SECTION_NAME>GradeMS</SECTION_NAME>                                           
    352352                                        </SECTION_NAMES>
    353353                                        <SELECTIONS>  <!-- These limit the selections a user can make - limited to available data -->
     
    495495                        <ibis:include href="section/GradeMS.xml"/>
    496496                        <ibis:include href="section/GradeHS.xml"/>
    497                         <ibis:include href="section/Sex.xml"/>
     497<!--                    <ibis:include href="section/Sex.xml"/> -->
    498498                        <ibis:include href="section/RaceEth.xml"/>
     499                        <ibis:include href="section/OtherDemographics.xml"/>
    499500                </SECTIONS>
    500501       
     
    514515                <ibis:include href="dimension/GradeMS.xml"/>
    515516               
    516                 <ibis:include href="dimension/Sex.xml"/>
     517<!--            <ibis:include href="dimension/Sex.xml"/> -->
    517518                <ibis:include href="dimension/DOHRace.xml"/>
    518519                <ibis:include href="dimension/CenRace.xml"/>
    519520                <ibis:include href="dimension/PrgRace.xml"/>
    520521
     522                <ibis:include href="dimension/Hispanic.xml"/>
     523                <ibis:include href="dimension/SexOrientCat.xml"/>
     524                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     525                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     526                <ibis:include href="dimension/TransgenderCat.xml"/>
     527                <ibis:include href="dimension/SexGenMinnority.xml"/>
     528
    521529        </DIMENSIONS>
    522530</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/GradeIndCat.xml

    r21383 r21468  
    493493                        <ibis:include href="section/Geo.xml"/>
    494494                        <ibis:include href="section/YearOdd_05_19.xml"/>
    495                         <ibis:include href="section/GradeMS.xml"/>
    496                         <ibis:include href="section/GradeHS.xml"/>
     495<!--                    <ibis:include href="section/GradeMS.xml"/> -->
     496<!--                    <ibis:include href="section/GradeHS.xml"/> -->
    497497                        <ibis:include href="section/Sex.xml"/>
    498498                        <ibis:include href="section/RaceEth.xml"/>
     499                        <ibis:include href="section/OtherDemographics.xml"/>
    499500                </SECTIONS>
    500501       
     
    510511                <ibis:include href="dimension/GeoCnty.xml"/>
    511512                <ibis:include href="dimension/State.xml"/>
    512                 <ibis:include href="dimension/GradeProxy.xml"/>
    513                 <ibis:include href="dimension/GradeHS.xml"/>
    514                 <ibis:include href="dimension/GradeMS.xml"/>
     513<!--            <ibis:include href="dimension/GradeProxy.xml"/> -->
     514<!--            <ibis:include href="dimension/GradeHS.xml"/> -->
     515<!--            <ibis:include href="dimension/GradeMS.xml"/> -->
    515516               
    516517                <ibis:include href="dimension/Sex.xml"/>
     
    519520                <ibis:include href="dimension/PrgRace.xml"/>
    520521
     522                <ibis:include href="dimension/Hispanic.xml"/>
     523                <ibis:include href="dimension/SexOrientCat.xml"/>
     524                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     525                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     526                <ibis:include href="dimension/TransgenderCat.xml"/>
     527                <ibis:include href="dimension/SexGenMinnority.xml"/>
     528
    521529        </DIMENSIONS>
    522530</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/GradesAB.xml

    r21383 r21468  
    533533                        <ibis:include href="section/Sex.xml"/>
    534534                        <ibis:include href="section/RaceEth.xml"/>
     535                        <ibis:include href="section/OtherDemographics.xml"/>
    535536                </SECTIONS>
    536537       
     
    556557                <ibis:include href="dimension/PrgRace.xml"/>
    557558
     559                <ibis:include href="dimension/Hispanic.xml"/>
     560                <ibis:include href="dimension/SexOrientCat.xml"/>
     561                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     562                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     563                <ibis:include href="dimension/TransgenderCat.xml"/>
     564                <ibis:include href="dimension/SexGenMinnority.xml"/>
     565
    558566        </DIMENSIONS>
    559567</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/GradesDF.xml

    r21383 r21468  
    535535                        <ibis:include href="section/Sex.xml"/>
    536536                        <ibis:include href="section/RaceEth.xml"/>
     537                        <ibis:include href="section/OtherDemographics.xml"/>
    537538                </SECTIONS>
    538539       
     
    558559                <ibis:include href="dimension/PrgRace.xml"/>
    559560
     561                <ibis:include href="dimension/Hispanic.xml"/>
     562                <ibis:include href="dimension/SexOrientCat.xml"/>
     563                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     564                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     565                <ibis:include href="dimension/TransgenderCat.xml"/>
     566                <ibis:include href="dimension/SexGenMinnority.xml"/>
     567
    560568        </DIMENSIONS>
    561569</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/HarassBully.xml

    r21383 r21468  
    537537                        <ibis:include href="section/Sex.xml"/>
    538538                        <ibis:include href="section/RaceEth.xml"/>
     539                        <ibis:include href="section/OtherDemographics.xml"/>
    539540                </SECTIONS>
    540541       
     
    558559                <ibis:include href="dimension/PrgRace.xml"/>
    559560
     561                <ibis:include href="dimension/Hispanic.xml"/>
     562                <ibis:include href="dimension/SexOrientCat.xml"/>
     563                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     564                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     565                <ibis:include href="dimension/TransgenderCat.xml"/>
     566                <ibis:include href="dimension/SexGenMinnority.xml"/>
     567
    560568        </DIMENSIONS>
    561569</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/HaveAdult.xml

    r21382 r21468  
    517517                        <ibis:include href="section/Sex.xml"/>
    518518                        <ibis:include href="section/RaceEth.xml"/>
     519                        <ibis:include href="section/OtherDemographics.xml"/>
    519520                </SECTIONS>
    520521       
     
    539540                <ibis:include href="dimension/PrgRace.xml"/>
    540541
     542                <ibis:include href="dimension/Hispanic.xml"/>
     543                <ibis:include href="dimension/SexOrientCat.xml"/>
     544                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     545                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     546                <ibis:include href="dimension/TransgenderCat.xml"/>
     547                <ibis:include href="dimension/SexGenMinnority.xml"/>
     548
    541549        </DIMENSIONS>
    542550</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/HelmetBike.xml

    r21151 r21468  
    530530                        <ibis:include href="section/Sex.xml"/>
    531531                        <ibis:include href="section/RaceEth.xml"/>
     532                        <ibis:include href="section/OtherDemographics.xml"/>
    532533                </SECTIONS>
    533534       
     
    555556                <ibis:include href="dimension/PrgRace.xml"/>
    556557
     558                <ibis:include href="dimension/Hispanic.xml"/>
     559                <ibis:include href="dimension/SexOrientCat.xml"/>
     560                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     561                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     562                <ibis:include href="dimension/TransgenderCat.xml"/>
     563                <ibis:include href="dimension/SexGenMinnority.xml"/>
     564
    557565        </DIMENSIONS>
    558566</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/HelmetOther.xml

    r13857 r21468  
    307307                        <ibis:include href="section/Sex.xml"/>
    308308                        <ibis:include href="section/RaceEth.xml"/>
     309                        <ibis:include href="section/OtherDemographics.xml"/>
    309310                </SECTIONS>
    310311       
     
    330331                <ibis:include href="dimension/PrgRace.xml"/>
    331332
     333                <ibis:include href="dimension/Hispanic.xml"/>
     334                <ibis:include href="dimension/SexOrientCat.xml"/>
     335                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     336                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     337                <ibis:include href="dimension/TransgenderCat.xml"/>
     338                <ibis:include href="dimension/SexGenMinnority.xml"/>
     339
    332340        </DIMENSIONS>
    333341</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/HispanicInd.xml

    r21445 r21468  
    2121-->
    2222        <ibis:doc>
    23                 <name>query/module/yrbs/Hispanic.xml</name>
     23                <name>query/module/yrbs/HispanicInd.xml</name>
    2424                <summary>Query Module definition</summary>
    2525                <description/>
     
    2828        </ibis:doc>
    2929
    30         <NAME>Hispanic</NAME> <!-- We are using the Indicator Dimension name -->
     30        <NAME>HispanicInd</NAME> <!-- We are using the Indicator Dimension name -->
    3131        <TITLE>Hawaii's Youth Risk Behavior Survey (YRBS) Data</TITLE>
    3232        <DESCRIPTION>Hawaii YRBS Data</DESCRIPTION>
     
    4949                <PARAMETER>
    5050                        <NAME>spvar1</NAME>
    51                         <VALUE>HISPANIC</VALUE> <!-- SAS VAR name that gets inserted in the .def file -->
     51                        <VALUE>HISPANICIND</VALUE> <!-- SAS VAR name that gets inserted in the .def file -->
    5252                </PARAMETER>
    5353                <PARAMETER>
    5454                        <NAME>filter_exclude</NAME>
    55                         <VALUE>Hispanic</VALUE> <!-- Dimension Name -->
     55                        <VALUE>HispanicInd</VALUE> <!-- Dimension Name -->
    5656                </PARAMETER>
    5757                <PARAMETER>
    5858                        <NAME>spvar2</NAME>
    59                         <VALUE>%Hispanic%</VALUE> <!-- Dimension Value Selected by the User -->
     59                        <VALUE>%HispanicInd%</VALUE> <!-- Dimension Value Selected by the User -->
    6060                </PARAMETER>
    6161        </PARAMETERS>
     
    6868        <CONFIGURATIONS>
    6969
    70                 <CONFIGURATION><NAME>Hispanic_HS_ST</NAME>
     70                <CONFIGURATION><NAME>HispanicInd_HS_ST</NAME>
    7171                        <TITLE>Hispanic or Latino, High Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
    72                         <DESCRIPTION><ibis:include href="text/Hispanic.xml"/></DESCRIPTION>
     72                        <DESCRIPTION><ibis:include href="text/HispanicInd.xml"/></DESCRIPTION>
    7373                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
    7474                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
     
    7878                                        <NAME>Percent</NAME>
    7979                                        <TITLE>Hispanic or Latino</TITLE>  <!-- Short Title, this is the Map Legend, Chart Title and Data Table column Title -->
    80                                         <DESCRIPTION><ibis:include href="text/Hispanic.xml"/></DESCRIPTION>
     80                                        <DESCRIPTION><ibis:include href="text/HispanicInd.xml"/></DESCRIPTION>
    8181                                        <XSLT_FORMAT_PATTERN>0.0'%'</XSLT_FORMAT_PATTERN>
    8282                                        <NUMERATOR>
     
    129129                        <DATA_NOTES>
    130130                                <DATA_NOTE><TITLE>Question Wording:</TITLE>
    131                                         <ibis:include href="text/Hispanic.xml"/>
     131                                        <ibis:include href="text/HispanicInd.xml"/>
    132132                                </DATA_NOTE>
    133133                                <ibis:include href="data_note/RedFlag.xml"/>
     
    165165                </CONFIGURATION>
    166166
    167                 <CONFIGURATION><NAME>Hispanic_MS_ST</NAME>
     167                <CONFIGURATION><NAME>HispanicInd_MS_ST</NAME>
    168168                        <TITLE>Hispanic or Latino, Middle Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
    169                         <DESCRIPTION><ibis:include href="text/Hispanic.xml"/></DESCRIPTION>
     169                        <DESCRIPTION><ibis:include href="text/HispanicInd.xml"/></DESCRIPTION>
    170170                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
    171171                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
     
    175175                                        <NAME>Percent</NAME>
    176176                                        <TITLE>Hispanic or Latino</TITLE>  <!-- Short Title, this is the Map Legend, Chart Title and Data Table column Title -->
    177                                         <DESCRIPTION><ibis:include href="text/Hispanic.xml"/></DESCRIPTION>
     177                                        <DESCRIPTION><ibis:include href="text/HispanicInd.xml"/></DESCRIPTION>
    178178                                        <XSLT_FORMAT_PATTERN>0.0'%'</XSLT_FORMAT_PATTERN>
    179179                                        <NUMERATOR>
     
    226226                        <DATA_NOTES>
    227227                                <DATA_NOTE><TITLE>Question Wording:</TITLE>
    228                                         <ibis:include href="text/Hispanic.xml"/>
     228                                        <ibis:include href="text/HispanicInd.xml"/>
    229229                                </DATA_NOTE>
    230230                                <ibis:include href="data_note/RedFlag.xml"/>
     
    262262                </CONFIGURATION>
    263263
    264                 <CONFIGURATION><NAME>Hispanic_HS_CNTY</NAME>
     264                <CONFIGURATION><NAME>HispanicInd_HS_CNTY</NAME>
    265265                        <TITLE>Hispanic or Latino, High Schools, County-level</TITLE><!-- Short Title, - this is the title on the Query Builder page -->
    266                         <DESCRIPTION><ibis:include href="text/Hispanic.xml"/></DESCRIPTION>
     266                        <DESCRIPTION><ibis:include href="text/HispanicInd.xml"/></DESCRIPTION>
    267267                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
    268268                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
     
    273273                                        <NAME>Percent</NAME>
    274274                                        <TITLE>Hispanic or Latino</TITLE>  <!-- Short Title, this is the Map Legend, Chart Title and Data Table column Title -->
    275                                         <DESCRIPTION><ibis:include href="text/Hispanic.xml"/></DESCRIPTION>
     275                                        <DESCRIPTION><ibis:include href="text/HispanicInd.xml"/></DESCRIPTION>
    276276                                        <XSLT_FORMAT_PATTERN>0.0'%'</XSLT_FORMAT_PATTERN>
    277277                                        <MISSING_QUERY_RESULT_RECORD_VALUE>n/a</MISSING_QUERY_RESULT_RECORD_VALUE>
     
    330330                        <DATA_NOTES>
    331331                                <DATA_NOTE><TITLE>Question Wording:</TITLE>
    332                                         <ibis:include href="text/Hispanic.xml"/>
     332                                        <ibis:include href="text/HispanicInd.xml"/>
    333333                                </DATA_NOTE>
    334                                 <ibis:include href="data_note/HSHawaiiCounty.xml"/>
     334                                <!-- <ibis:include href="data_note/HSHawaiiCounty.xml"/> -->
    335335                                <ibis:include href="data_note/RedFlag.xml"/>
    336336                                <ibis:include href="data_note/Suppression.xml"/>
     
    372372                        </CRITERIA>
    373373                </CONFIGURATION>
    374                 <CONFIGURATION><NAME>Hispanic_MS_CNTY</NAME>
     374                <CONFIGURATION><NAME>HispanicInd_MS_CNTY</NAME>
    375375                        <TITLE>Hispanic or Latino, Middle Schools, County-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
    376                         <DESCRIPTION><ibis:include href="text/Hispanic.xml"/></DESCRIPTION>
     376                        <DESCRIPTION><ibis:include href="text/HispanicInd.xml"/></DESCRIPTION>
    377377                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>  <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
    378378                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
     
    382382                                        <NAME>Percent</NAME>
    383383                                        <TITLE>Hispanic or Latino</TITLE>  <!-- Short Title - this is the Map Legend, Chart Title and Data Table column Title -->
    384                                         <DESCRIPTION><ibis:include href="text/Hispanic.xml"/></DESCRIPTION>
     384                                        <DESCRIPTION><ibis:include href="text/HispanicInd.xml"/></DESCRIPTION>
    385385                                        <XSLT_FORMAT_PATTERN>0.0'%'</XSLT_FORMAT_PATTERN>
    386386                                        <NUMERATOR>
     
    437437                        <DATA_NOTES>
    438438                                <DATA_NOTE><TITLE>Question Wording:</TITLE>
    439                                         <ibis:include href="text/Hispanic.xml"/>
     439                                        <ibis:include href="text/HispanicInd.xml"/>
    440440                                </DATA_NOTE>
    441441                                <ibis:include href="data_note/RedFlag.xml"/>
     
    493493                                <SELECTED_DIMENSIONS>
    494494                                        <SELECTED_DIMENSION>
    495                                                 <NAME>Hispanic</NAME>
     495                                                <NAME>HispanicInd</NAME>
    496496                                                <VALUES><VALUE>Yes</VALUE></VALUES>
    497497                                        </SELECTED_DIMENSION>
     
    502502                                        <HELP>
    503503                                                <TITLE>Question</TITLE>
    504                                                 <ibis:include href="text/Hispanic.xml"/>
     504                                                <ibis:include href="text/HispanicInd.xml"/>
    505505                                        </HELP>
    506506                                        <SELECTION_TYPE><SINGLE/></SELECTION_TYPE>
    507                                         <DIMENSION_NAME>Hispanic</DIMENSION_NAME>
     507                                        <DIMENSION_NAME>HispanicInd</DIMENSION_NAME>
    508508                                </SELECTIONS>
    509509                        </SECTION>
     
    515515                        <ibis:include href="section/Sex.xml"/>
    516516                        <ibis:include href="section/RaceEth.xml"/>
     517                        <ibis:include href="section/OtherDemographics_NoHispanic.xml"/>
    517518                </SECTIONS>
    518519       
     
    520521
    521522        <DIMENSIONS> <!-- Include all dimensions needed for this module, and excluded unwanted dimensions as needed in each configuration -->
    522                 <ibis:include href="dimension/indicator/Hispanic.xml"/>
     523                <ibis:include href="dimension/indicator/HispanicInd.xml"/>
    523524
    524525                <ibis:include href="dimension/YearProxy.xml"/>
     
    536537                <ibis:include href="dimension/PrgRace.xml"/>
    537538
     539<!--            <ibis:include href="dimension/Hispanic.xml"/> -->
     540                <ibis:include href="dimension/SexOrientCat.xml"/>
     541                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     542                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     543                <ibis:include href="dimension/TransgenderCat.xml"/>
     544                <ibis:include href="dimension/SexGenMinnority.xml"/>
     545
    538546        </DIMENSIONS>
    539547</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/Hungry30D.xml

    r21382 r21468  
    501501                        <ibis:include href="section/Sex.xml"/>
    502502                        <ibis:include href="section/RaceEth.xml"/>
     503                        <ibis:include href="section/OtherDemographics.xml"/>
    503504                </SECTIONS>
    504505       
     
    522523                <ibis:include href="dimension/PrgRace.xml"/>
    523524
     525                <ibis:include href="dimension/Hispanic.xml"/>
     526                <ibis:include href="dimension/SexOrientCat.xml"/>
     527                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     528                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     529                <ibis:include href="dimension/TransgenderCat.xml"/>
     530                <ibis:include href="dimension/SexGenMinnority.xml"/>
     531
    524532        </DIMENSIONS>
    525533</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/JuiceDrksPerDayCat.xml

    r21383 r21468  
    278278                        <ibis:include href="section/Sex.xml"/>
    279279                        <ibis:include href="section/RaceEth.xml"/>
     280                        <ibis:include href="section/OtherDemographics.xml"/>
    280281                </SECTIONS>
    281282       
     
    299300                <ibis:include href="dimension/PrgRace.xml"/>
    300301
     302                <ibis:include href="dimension/Hispanic.xml"/>
     303                <ibis:include href="dimension/SexOrientCat.xml"/>
     304                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     305                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     306                <ibis:include href="dimension/TransgenderCat.xml"/>
     307                <ibis:include href="dimension/SexGenMinnority.xml"/>
     308
    301309        </DIMENSIONS>
    302310</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/JuiceDrksPerDayCatAny.xml

    r21383 r21468  
    307307                        <ibis:include href="section/Sex.xml"/>
    308308                        <ibis:include href="section/RaceEth.xml"/>
     309                        <ibis:include href="section/OtherDemographics.xml"/>
    309310                </SECTIONS>
    310311       
     
    328329                <ibis:include href="dimension/PrgRace.xml"/>
    329330
     331                <ibis:include href="dimension/Hispanic.xml"/>
     332                <ibis:include href="dimension/SexOrientCat.xml"/>
     333                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     334                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     335                <ibis:include href="dimension/TransgenderCat.xml"/>
     336                <ibis:include href="dimension/SexGenMinnority.xml"/>
     337
    330338        </DIMENSIONS>
    331339</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/LsWgtDisord.xml

    r21383 r21468  
    307307                        <ibis:include href="section/Sex.xml"/>
    308308                        <ibis:include href="section/RaceEth.xml"/>
     309                        <ibis:include href="section/OtherDemographics.xml"/>
    309310                </SECTIONS>
    310311       
     
    330331                <ibis:include href="dimension/PrgRace.xml"/>
    331332
     333                <ibis:include href="dimension/Hispanic.xml"/>
     334                <ibis:include href="dimension/SexOrientCat.xml"/>
     335                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     336                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     337                <ibis:include href="dimension/TransgenderCat.xml"/>
     338                <ibis:include href="dimension/SexGenMinnority.xml"/>
     339
    332340        </DIMENSIONS>
    333341</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/LsWgtDisord30D.xml

    r21383 r21468  
    309309                        <ibis:include href="section/Sex.xml"/>
    310310                        <ibis:include href="section/RaceEth.xml"/>
     311                        <ibis:include href="section/OtherDemographics.xml"/>
    311312                </SECTIONS>
    312313       
     
    332333                <ibis:include href="dimension/PrgRace.xml"/>
    333334
     335                <ibis:include href="dimension/Hispanic.xml"/>
     336                <ibis:include href="dimension/SexOrientCat.xml"/>
     337                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     338                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     339                <ibis:include href="dimension/TransgenderCat.xml"/>
     340                <ibis:include href="dimension/SexGenMinnority.xml"/>
     341
    334342        </DIMENSIONS>
    335343</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/LsWgtFasting.xml

    r21383 r21468  
    307307                        <ibis:include href="section/Sex.xml"/>
    308308                        <ibis:include href="section/RaceEth.xml"/>
     309                        <ibis:include href="section/OtherDemographics.xml"/>
    309310                </SECTIONS>
    310311       
     
    330331                <ibis:include href="dimension/PrgRace.xml"/>
    331332
     333                <ibis:include href="dimension/Hispanic.xml"/>
     334                <ibis:include href="dimension/SexOrientCat.xml"/>
     335                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     336                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     337                <ibis:include href="dimension/TransgenderCat.xml"/>
     338                <ibis:include href="dimension/SexGenMinnority.xml"/>
     339
    332340        </DIMENSIONS>
    333341</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/LsWgtFasting30D.xml

    r21383 r21468  
    309309                        <ibis:include href="section/Sex.xml"/>
    310310                        <ibis:include href="section/RaceEth.xml"/>
     311                        <ibis:include href="section/OtherDemographics.xml"/>
    311312                </SECTIONS>
    312313       
     
    332333                <ibis:include href="dimension/PrgRace.xml"/>
    333334
     335                <ibis:include href="dimension/Hispanic.xml"/>
     336                <ibis:include href="dimension/SexOrientCat.xml"/>
     337                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     338                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     339                <ibis:include href="dimension/TransgenderCat.xml"/>
     340                <ibis:include href="dimension/SexGenMinnority.xml"/>
     341
    334342        </DIMENSIONS>
    335343</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/LsWgtPills.xml

    r21383 r21468  
    307307                        <ibis:include href="section/Sex.xml"/>
    308308                        <ibis:include href="section/RaceEth.xml"/>
     309                        <ibis:include href="section/OtherDemographics.xml"/>
    309310                </SECTIONS>
    310311       
     
    330331                <ibis:include href="dimension/PrgRace.xml"/>
    331332
     333                <ibis:include href="dimension/Hispanic.xml"/>
     334                <ibis:include href="dimension/SexOrientCat.xml"/>
     335                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     336                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     337                <ibis:include href="dimension/TransgenderCat.xml"/>
     338                <ibis:include href="dimension/SexGenMinnority.xml"/>
     339
    332340        </DIMENSIONS>
    333341</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/LsWgtPills30D.xml

    r21383 r21468  
    309309                        <ibis:include href="section/Sex.xml"/>
    310310                        <ibis:include href="section/RaceEth.xml"/>
     311                        <ibis:include href="section/OtherDemographics.xml"/>
    311312                </SECTIONS>
    312313       
     
    332333                <ibis:include href="dimension/PrgRace.xml"/>
    333334
     335                <ibis:include href="dimension/Hispanic.xml"/>
     336                <ibis:include href="dimension/SexOrientCat.xml"/>
     337                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     338                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     339                <ibis:include href="dimension/TransgenderCat.xml"/>
     340                <ibis:include href="dimension/SexGenMinnority.xml"/>
     341
    334342        </DIMENSIONS>
    335343</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/LsWgtTrying.xml

    r21383 r21468  
    531531                        <ibis:include href="section/Sex.xml"/>
    532532                        <ibis:include href="section/RaceEth.xml"/>
     533                        <ibis:include href="section/OtherDemographics.xml"/>
    533534                </SECTIONS>
    534535       
     
    555556                <ibis:include href="dimension/PrgRace.xml"/>
    556557
     558                <ibis:include href="dimension/Hispanic.xml"/>
     559                <ibis:include href="dimension/SexOrientCat.xml"/>
     560                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     561                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     562                <ibis:include href="dimension/TransgenderCat.xml"/>
     563                <ibis:include href="dimension/SexGenMinnority.xml"/>
     564
    557565        </DIMENSIONS>
    558566</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/LsWgtUnhlth30D.xml

    r21383 r21468  
    501501                        <ibis:include href="section/Sex.xml"/>
    502502                        <ibis:include href="section/RaceEth.xml"/>
     503                        <ibis:include href="section/OtherDemographics.xml"/>
    503504                </SECTIONS>
    504505       
     
    522523                <ibis:include href="dimension/PrgRace.xml"/>
    523524
     525                <ibis:include href="dimension/Hispanic.xml"/>
     526                <ibis:include href="dimension/SexOrientCat.xml"/>
     527                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     528                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     529                <ibis:include href="dimension/TransgenderCat.xml"/>
     530                <ibis:include href="dimension/SexGenMinnority.xml"/>
     531
    524532        </DIMENSIONS>
    525533</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/LsWgtVomLax.xml

    r21383 r21468  
    314314                        <ibis:include href="section/Sex.xml"/>
    315315                        <ibis:include href="section/RaceEth.xml"/>
     316                        <ibis:include href="section/OtherDemographics.xml"/>
    316317                </SECTIONS>
    317318       
     
    337338                <ibis:include href="dimension/PrgRace.xml"/>
    338339
     340                <ibis:include href="dimension/Hispanic.xml"/>
     341                <ibis:include href="dimension/SexOrientCat.xml"/>
     342                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     343                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     344                <ibis:include href="dimension/TransgenderCat.xml"/>
     345                <ibis:include href="dimension/SexGenMinnority.xml"/>
     346
    339347        </DIMENSIONS>
    340348</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/LsWgtVomLax30D.xml

    r21383 r21468  
    309309                        <ibis:include href="section/Sex.xml"/>
    310310                        <ibis:include href="section/RaceEth.xml"/>
     311                        <ibis:include href="section/OtherDemographics.xml"/>
    311312                </SECTIONS>
    312313       
     
    332333                <ibis:include href="dimension/PrgRace.xml"/>
    333334
     335                <ibis:include href="dimension/Hispanic.xml"/>
     336                <ibis:include href="dimension/SexOrientCat.xml"/>
     337                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     338                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     339                <ibis:include href="dimension/TransgenderCat.xml"/>
     340                <ibis:include href="dimension/SexGenMinnority.xml"/>
     341
    334342        </DIMENSIONS>
    335343</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/MilitaryKid.xml

    r21383 r21468  
    501501                        <ibis:include href="section/Sex.xml"/>
    502502                        <ibis:include href="section/RaceEth.xml"/>
     503                        <ibis:include href="section/OtherDemographics.xml"/>
    503504                </SECTIONS>
    504505       
     
    522523                <ibis:include href="dimension/PrgRace.xml"/>
    523524
     525                <ibis:include href="dimension/Hispanic.xml"/>
     526                <ibis:include href="dimension/SexOrientCat.xml"/>
     527                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     528                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     529                <ibis:include href="dimension/TransgenderCat.xml"/>
     530                <ibis:include href="dimension/SexGenMinnority.xml"/>
     531
    524532        </DIMENSIONS>
    525533</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/MntlHlthGet.xml

    r21398 r21468  
    501501                        <ibis:include href="section/Sex.xml"/>
    502502                        <ibis:include href="section/RaceEth.xml"/>
     503                        <ibis:include href="section/OtherDemographics.xml"/>
    503504                </SECTIONS>
    504505       
     
    522523                <ibis:include href="dimension/PrgRace.xml"/>
    523524
     525                <ibis:include href="dimension/Hispanic.xml"/>
     526                <ibis:include href="dimension/SexOrientCat.xml"/>
     527                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     528                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     529                <ibis:include href="dimension/TransgenderCat.xml"/>
     530                <ibis:include href="dimension/SexGenMinnority.xml"/>
     531
    524532        </DIMENSIONS>
    525533</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/MntlHlthIssue.xml

    r21383 r21468  
    501501                        <ibis:include href="section/Sex.xml"/>
    502502                        <ibis:include href="section/RaceEth.xml"/>
     503                        <ibis:include href="section/OtherDemographics.xml"/>
    503504                </SECTIONS>
    504505       
     
    522523                <ibis:include href="dimension/PrgRace.xml"/>
    523524
     525                <ibis:include href="dimension/Hispanic.xml"/>
     526                <ibis:include href="dimension/SexOrientCat.xml"/>
     527                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     528                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     529                <ibis:include href="dimension/TransgenderCat.xml"/>
     530                <ibis:include href="dimension/SexGenMinnority.xml"/>
     531
    524532        </DIMENSIONS>
    525533</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/MostDrinks5Cat.xml

    r21151 r21468  
    280280                        <ibis:include href="section/Sex.xml"/>
    281281                        <ibis:include href="section/RaceEth.xml"/>
     282                        <ibis:include href="section/OtherDemographics.xml"/>
    282283                </SECTIONS>
    283284       
     
    302303                <ibis:include href="dimension/PrgRace.xml"/>
    303304
     305                <ibis:include href="dimension/Hispanic.xml"/>
     306                <ibis:include href="dimension/SexOrientCat.xml"/>
     307                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     308                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     309                <ibis:include href="dimension/TransgenderCat.xml"/>
     310                <ibis:include href="dimension/SexGenMinnority.xml"/>
     311
    304312        </DIMENSIONS>
    305313</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/MostDrinks5CatAny.xml

    r21151 r21468  
    310310                        <ibis:include href="section/Sex.xml"/>
    311311                        <ibis:include href="section/RaceEth.xml"/>
     312                        <ibis:include href="section/OtherDemographics.xml"/>
    312313                </SECTIONS>
    313314       
     
    332333                <ibis:include href="dimension/PrgRace.xml"/>
    333334
     335                <ibis:include href="dimension/Hispanic.xml"/>
     336                <ibis:include href="dimension/SexOrientCat.xml"/>
     337                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     338                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     339                <ibis:include href="dimension/TransgenderCat.xml"/>
     340                <ibis:include href="dimension/SexGenMinnority.xml"/>
     341
    334342        </DIMENSIONS>
    335343</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/MostDrinksCurr4Cat.xml

    r21151 r21468  
    281281                        <ibis:include href="section/Sex.xml"/>
    282282                        <ibis:include href="section/RaceEth.xml"/>
     283                        <ibis:include href="section/OtherDemographics.xml"/>
    283284                </SECTIONS>
    284285       
     
    303304                <ibis:include href="dimension/PrgRace.xml"/>
    304305
     306                <ibis:include href="dimension/Hispanic.xml"/>
     307                <ibis:include href="dimension/SexOrientCat.xml"/>
     308                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     309                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     310                <ibis:include href="dimension/TransgenderCat.xml"/>
     311                <ibis:include href="dimension/SexGenMinnority.xml"/>
     312
    305313        </DIMENSIONS>
    306314</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/MostDrinksCurr4CatAny.xml

    r21151 r21468  
    310310                        <ibis:include href="section/Sex.xml"/>
    311311                        <ibis:include href="section/RaceEth.xml"/>
     312                        <ibis:include href="section/OtherDemographics.xml"/>
    312313                </SECTIONS>
    313314       
     
    332333                <ibis:include href="dimension/PrgRace.xml"/>
    333334
     335                <ibis:include href="dimension/Hispanic.xml"/>
     336                <ibis:include href="dimension/SexOrientCat.xml"/>
     337                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     338                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     339                <ibis:include href="dimension/TransgenderCat.xml"/>
     340                <ibis:include href="dimension/SexGenMinnority.xml"/>
     341
    334342        </DIMENSIONS>
    335343</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/NoSchlSick.xml

    r21337 r21468  
    501501                        <ibis:include href="section/Sex.xml"/>
    502502                        <ibis:include href="section/RaceEth.xml"/>
     503                        <ibis:include href="section/OtherDemographics.xml"/>
    503504                </SECTIONS>
    504505       
     
    522523                <ibis:include href="dimension/PrgRace.xml"/>
    523524
     525                <ibis:include href="dimension/Hispanic.xml"/>
     526                <ibis:include href="dimension/SexOrientCat.xml"/>
     527                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     528                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     529                <ibis:include href="dimension/TransgenderCat.xml"/>
     530                <ibis:include href="dimension/SexGenMinnority.xml"/>
     531
    524532        </DIMENSIONS>
    525533</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/NoSchlSickDayCat.xml

    r21338 r21468  
    481481                        <ibis:include href="section/Sex.xml"/>
    482482                        <ibis:include href="section/RaceEth.xml"/>
     483                        <ibis:include href="section/OtherDemographics.xml"/>
    483484                </SECTIONS>
    484485       
     
    503504                <ibis:include href="dimension/PrgRace.xml"/>
    504505
     506                <ibis:include href="dimension/Hispanic.xml"/>
     507                <ibis:include href="dimension/SexOrientCat.xml"/>
     508                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     509                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     510                <ibis:include href="dimension/TransgenderCat.xml"/>
     511                <ibis:include href="dimension/SexGenMinnority.xml"/>
     512
    505513        </DIMENSIONS>
    506514</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/NoSchlSickDayCatAny.xml

    r21383 r21468  
    516516                        <ibis:include href="section/Sex.xml"/>
    517517                        <ibis:include href="section/RaceEth.xml"/>
     518                        <ibis:include href="section/OtherDemographics.xml"/>
    518519                </SECTIONS>
    519520       
     
    536537                <ibis:include href="dimension/PrgRace.xml"/>
    537538
     539                <ibis:include href="dimension/Hispanic.xml"/>
     540                <ibis:include href="dimension/SexOrientCat.xml"/>
     541                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     542                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     543                <ibis:include href="dimension/TransgenderCat.xml"/>
     544                <ibis:include href="dimension/SexGenMinnority.xml"/>
     545
    538546        </DIMENSIONS>
    539547</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/NoToSex.xml

    r21382 r21468  
    300300                        <ibis:include href="section/Sex.xml"/>
    301301                        <ibis:include href="section/RaceEth.xml"/>
     302                        <ibis:include href="section/OtherDemographics.xml"/>
    302303                </SECTIONS>
    303304       
     
    321322                <ibis:include href="dimension/PrgRace.xml"/>
    322323
     324                <ibis:include href="dimension/Hispanic.xml"/>
     325                <ibis:include href="dimension/SexOrientCat.xml"/>
     326                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     327                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     328                <ibis:include href="dimension/TransgenderCat.xml"/>
     329                <ibis:include href="dimension/SexGenMinnority.xml"/>
     330
    323331        </DIMENSIONS>
    324332</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/OvrWgt.xml

    r21383 r21468  
    298298                        <ibis:include href="section/Sex.xml"/>
    299299                        <ibis:include href="section/RaceEth.xml"/>
     300                        <ibis:include href="section/OtherDemographics.xml"/>
    300301                </SECTIONS>
    301302       
     
    321322                <ibis:include href="dimension/PrgRace.xml"/>
    322323
     324                <ibis:include href="dimension/Hispanic.xml"/>
     325                <ibis:include href="dimension/SexOrientCat.xml"/>
     326                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     327                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     328                <ibis:include href="dimension/TransgenderCat.xml"/>
     329                <ibis:include href="dimension/SexGenMinnority.xml"/>
     330
    323331        </DIMENSIONS>
    324332</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/OvrWgtObese.xml

    r21383 r21468  
    314314                        <ibis:include href="section/Sex.xml"/>
    315315                        <ibis:include href="section/RaceEth.xml"/>
     316                        <ibis:include href="section/OtherDemographics.xml"/>
    316317                </SECTIONS>
    317318       
     
    336337                <ibis:include href="dimension/PrgRace.xml"/>
    337338
     339                <ibis:include href="dimension/Hispanic.xml"/>
     340                <ibis:include href="dimension/SexOrientCat.xml"/>
     341                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     342                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     343                <ibis:include href="dimension/TransgenderCat.xml"/>
     344                <ibis:include href="dimension/SexGenMinnority.xml"/>
     345
    338346        </DIMENSIONS>
    339347</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/OvrWgtRisk.xml

    r21383 r21468  
    312312                        <ibis:include href="section/Sex.xml"/>
    313313                        <ibis:include href="section/RaceEth.xml"/>
     314                        <ibis:include href="section/OtherDemographics.xml"/>
    314315                </SECTIONS>
    315316       
     
    334335                <ibis:include href="dimension/PrgRace.xml"/>
    335336
     337                <ibis:include href="dimension/Hispanic.xml"/>
     338                <ibis:include href="dimension/SexOrientCat.xml"/>
     339                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     340                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     341                <ibis:include href="dimension/TransgenderCat.xml"/>
     342                <ibis:include href="dimension/SexGenMinnority.xml"/>
     343
    336344        </DIMENSIONS>
    337345</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/OvrWgtStu.xml

    r21151 r21468  
    530530                        <ibis:include href="section/Sex.xml"/>
    531531                        <ibis:include href="section/RaceEth.xml"/>
     532                        <ibis:include href="section/OtherDemographics.xml"/>
    532533                </SECTIONS>
    533534       
     
    554555                <ibis:include href="dimension/PrgRace.xml"/>
    555556
     557                <ibis:include href="dimension/Hispanic.xml"/>
     558                <ibis:include href="dimension/SexOrientCat.xml"/>
     559                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     560                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     561                <ibis:include href="dimension/TransgenderCat.xml"/>
     562                <ibis:include href="dimension/SexGenMinnority.xml"/>
     563
    556564        </DIMENSIONS>
    557565</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/ParAIDSTalk.xml

    r21382 r21468  
    199199                        <ibis:include href="section/Sex.xml"/>
    200200                        <ibis:include href="section/RaceEth.xml"/>
     201                        <ibis:include href="section/OtherDemographics.xml"/>
    201202                </SECTIONS>
    202203       
     
    220221                <ibis:include href="dimension/PrgRace.xml"/>
    221222
     223                <ibis:include href="dimension/Hispanic.xml"/>
     224                <ibis:include href="dimension/SexOrientCat.xml"/>
     225                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     226                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     227                <ibis:include href="dimension/TransgenderCat.xml"/>
     228                <ibis:include href="dimension/SexGenMinnority.xml"/>
     229
    222230        </DIMENSIONS>
    223231</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/PhysAct60Min0Of7D.xml

    r21383 r21468  
    519519                        <ibis:include href="section/Sex.xml"/>
    520520                        <ibis:include href="section/RaceEth.xml"/>
     521                        <ibis:include href="section/OtherDemographics.xml"/>
    521522                </SECTIONS>
    522523       
     
    541542                <ibis:include href="dimension/PrgRace.xml"/>
    542543
     544                <ibis:include href="dimension/Hispanic.xml"/>
     545                <ibis:include href="dimension/SexOrientCat.xml"/>
     546                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     547                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     548                <ibis:include href="dimension/TransgenderCat.xml"/>
     549                <ibis:include href="dimension/SexGenMinnority.xml"/>
     550
    543551        </DIMENSIONS>
    544552</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/PhysAct60Min5Of7D.xml

    r21383 r21468  
    519519                        <ibis:include href="section/Sex.xml"/>
    520520                        <ibis:include href="section/RaceEth.xml"/>
     521                        <ibis:include href="section/OtherDemographics.xml"/>
    521522                </SECTIONS>
    522523       
     
    541542                <ibis:include href="dimension/PrgRace.xml"/>
    542543
     544                <ibis:include href="dimension/Hispanic.xml"/>
     545                <ibis:include href="dimension/SexOrientCat.xml"/>
     546                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     547                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     548                <ibis:include href="dimension/TransgenderCat.xml"/>
     549                <ibis:include href="dimension/SexGenMinnority.xml"/>
     550
    543551        </DIMENSIONS>
    544552</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/PhysAct60Min7Of7D.xml

    r21383 r21468  
    504504                        <ibis:include href="section/Sex.xml"/>
    505505                        <ibis:include href="section/RaceEth.xml"/>
     506                        <ibis:include href="section/OtherDemographics.xml"/>
    506507                </SECTIONS>
    507508       
     
    526527                <ibis:include href="dimension/PrgRace.xml"/>
    527528
     529                <ibis:include href="dimension/Hispanic.xml"/>
     530                <ibis:include href="dimension/SexOrientCat.xml"/>
     531                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     532                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     533                <ibis:include href="dimension/TransgenderCat.xml"/>
     534                <ibis:include href="dimension/SexGenMinnority.xml"/>
     535
    528536        </DIMENSIONS>
    529537</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/PhysActMeetRec.xml

    r21383 r21468  
    503503                        <ibis:include href="section/Sex.xml"/>
    504504                        <ibis:include href="section/RaceEth.xml"/>
     505                        <ibis:include href="section/OtherDemographics.xml"/>
    505506                </SECTIONS>
    506507       
     
    525526                <ibis:include href="dimension/PrgRace.xml"/>
    526527
     528                <ibis:include href="dimension/Hispanic.xml"/>
     529                <ibis:include href="dimension/SexOrientCat.xml"/>
     530                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     531                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     532                <ibis:include href="dimension/TransgenderCat.xml"/>
     533                <ibis:include href="dimension/SexGenMinnority.xml"/>
     534
    527535        </DIMENSIONS>
    528536</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/PhysActSports12M.xml

    r21383 r21468  
    534534                        <ibis:include href="section/Sex.xml"/>
    535535                        <ibis:include href="section/RaceEth.xml"/>
     536                        <ibis:include href="section/OtherDemographics.xml"/>
    536537                </SECTIONS>
    537538       
     
    556557                <ibis:include href="dimension/PrgRace.xml"/>
    557558
     559                <ibis:include href="dimension/Hispanic.xml"/>
     560                <ibis:include href="dimension/SexOrientCat.xml"/>
     561                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     562                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     563                <ibis:include href="dimension/TransgenderCat.xml"/>
     564                <ibis:include href="dimension/SexGenMinnority.xml"/>
     565
    558566        </DIMENSIONS>
    559567</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/PhysActStrength.xml

    r21383 r21468  
    503503                        <ibis:include href="section/Sex.xml"/>
    504504                        <ibis:include href="section/RaceEth.xml"/>
     505                        <ibis:include href="section/OtherDemographics.xml"/>
    505506                </SECTIONS>
    506507       
     
    525526                <ibis:include href="dimension/PrgRace.xml"/>
    526527
     528                <ibis:include href="dimension/Hispanic.xml"/>
     529                <ibis:include href="dimension/SexOrientCat.xml"/>
     530                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     531                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     532                <ibis:include href="dimension/TransgenderCat.xml"/>
     533                <ibis:include href="dimension/SexGenMinnority.xml"/>
     534
    527535        </DIMENSIONS>
    528536</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/PhysEdAttend1Plus.xml

    r21383 r21468  
    523523                        <ibis:include href="section/Sex.xml"/>
    524524                        <ibis:include href="section/RaceEth.xml"/>
     525                        <ibis:include href="section/OtherDemographics.xml"/>
    525526                </SECTIONS>
    526527       
     
    545546                <ibis:include href="dimension/PrgRace.xml"/>
    546547
     548                <ibis:include href="dimension/Hispanic.xml"/>
     549                <ibis:include href="dimension/SexOrientCat.xml"/>
     550                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     551                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     552                <ibis:include href="dimension/TransgenderCat.xml"/>
     553                <ibis:include href="dimension/SexGenMinnority.xml"/>
     554
    547555        </DIMENSIONS>
    548556</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/PhysEdAttendDaily.xml

    r21383 r21468  
    519519                        <ibis:include href="section/Sex.xml"/>
    520520                        <ibis:include href="section/RaceEth.xml"/>
     521                        <ibis:include href="section/OtherDemographics.xml"/>
    521522                </SECTIONS>
    522523       
     
    541542                <ibis:include href="dimension/PrgRace.xml"/>
    542543
     544                <ibis:include href="dimension/Hispanic.xml"/>
     545                <ibis:include href="dimension/SexOrientCat.xml"/>
     546                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     547                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     548                <ibis:include href="dimension/TransgenderCat.xml"/>
     549                <ibis:include href="dimension/SexGenMinnority.xml"/>
     550
    543551        </DIMENSIONS>
    544552</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/ProgramRaceCat.xml

    r21383 r21468  
    496496                        <ibis:include href="section/GradeHS.xml"/>
    497497                        <ibis:include href="section/Sex.xml"/>
    498                         <ibis:include href="section/RaceEth.xml"/>
     498<!--                    <ibis:include href="section/RaceEth.xml"/> -->
     499                        <ibis:include href="section/OtherDemographics.xml"/>
    499500                </SECTIONS>
    500501       
     
    515516               
    516517                <ibis:include href="dimension/Sex.xml"/>
    517                 <ibis:include href="dimension/DOHRace.xml"/>
    518                 <ibis:include href="dimension/CenRace.xml"/>
    519                 <ibis:include href="dimension/PrgRace.xml"/>
     518<!--            <ibis:include href="dimension/DOHRace.xml"/> -->
     519<!--            <ibis:include href="dimension/CenRace.xml"/> -->
     520<!--            <ibis:include href="dimension/PrgRace.xml"/> -->
     521
     522                <ibis:include href="dimension/Hispanic.xml"/>
     523                <ibis:include href="dimension/SexOrientCat.xml"/>
     524                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     525                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     526                <ibis:include href="dimension/TransgenderCat.xml"/>
     527                <ibis:include href="dimension/SexGenMinnority.xml"/>
    520528
    521529        </DIMENSIONS>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/RodeWHighDrvHS.xml

    r21382 r21468  
    304304                        <ibis:include href="section/Sex.xml"/>
    305305                        <ibis:include href="section/RaceEth.xml"/>
     306                        <ibis:include href="section/OtherDemographics.xml"/>
    306307                </SECTIONS>
    307308       
     
    326327                <ibis:include href="dimension/PrgRace.xml"/>
    327328
     329                <ibis:include href="dimension/Hispanic.xml"/>
     330                <ibis:include href="dimension/SexOrientCat.xml"/>
     331                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     332                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     333                <ibis:include href="dimension/TransgenderCat.xml"/>
     334                <ibis:include href="dimension/SexGenMinnority.xml"/>
     335
    328336        </DIMENSIONS>
    329337</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/RodeWHighDrvMS.xml

    r13857 r21468  
    319319                        <ibis:include href="section/Sex.xml"/>
    320320                        <ibis:include href="section/RaceEth.xml"/>
     321                        <ibis:include href="section/OtherDemographics.xml"/>
    321322                </SECTIONS>
    322323       
     
    341342                <ibis:include href="dimension/PrgRace.xml"/>
    342343
     344                <ibis:include href="dimension/Hispanic.xml"/>
     345                <ibis:include href="dimension/SexOrientCat.xml"/>
     346                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     347                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     348                <ibis:include href="dimension/TransgenderCat.xml"/>
     349                <ibis:include href="dimension/SexGenMinnority.xml"/>
     350
    343351        </DIMENSIONS>
    344352</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/RodeWHighDrvMS1.xml

    r21382 r21468  
    317317                        <ibis:include href="section/Sex.xml"/>
    318318                        <ibis:include href="section/RaceEth.xml"/>
     319                        <ibis:include href="section/OtherDemographics.xml"/>
    319320                </SECTIONS>
    320321       
     
    338339                <ibis:include href="dimension/PrgRace.xml"/>
    339340
     341                <ibis:include href="dimension/Hispanic.xml"/>
     342                <ibis:include href="dimension/SexOrientCat.xml"/>
     343                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     344                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     345                <ibis:include href="dimension/TransgenderCat.xml"/>
     346                <ibis:include href="dimension/SexGenMinnority.xml"/>
     347
    340348        </DIMENSIONS>
    341349</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/SchAIDSAware.xml

    r21382 r21468  
    513513                        <ibis:include href="section/Sex.xml"/>
    514514                        <ibis:include href="section/RaceEth.xml"/>
     515                        <ibis:include href="section/OtherDemographics.xml"/>
    515516                </SECTIONS>
    516517       
     
    536537                <ibis:include href="dimension/PrgRace.xml"/>
    537538
     539                <ibis:include href="dimension/Hispanic.xml"/>
     540                <ibis:include href="dimension/SexOrientCat.xml"/>
     541                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     542                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     543                <ibis:include href="dimension/TransgenderCat.xml"/>
     544                <ibis:include href="dimension/SexGenMinnority.xml"/>
     545
    538546        </DIMENSIONS>
    539547</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/SchoolAdult.xml

    r21382 r21468  
    498498                        <ibis:include href="section/Sex.xml"/>
    499499                        <ibis:include href="section/RaceEth.xml"/>
     500                        <ibis:include href="section/OtherDemographics.xml"/>
    500501                </SECTIONS>
    501502       
     
    519520                <ibis:include href="dimension/PrgRace.xml"/>
    520521
     522                <ibis:include href="dimension/Hispanic.xml"/>
     523                <ibis:include href="dimension/SexOrientCat.xml"/>
     524                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     525                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     526                <ibis:include href="dimension/TransgenderCat.xml"/>
     527                <ibis:include href="dimension/SexGenMinnority.xml"/>
     528
    521529        </DIMENSIONS>
    522530</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/SchoolFight.xml

    r21383 r21468  
    531531                        <ibis:include href="section/Sex.xml"/>
    532532                        <ibis:include href="section/RaceEth.xml"/>
     533                        <ibis:include href="section/OtherDemographics.xml"/>
    533534                </SECTIONS>
    534535       
     
    556557                <ibis:include href="dimension/PrgRace.xml"/>
    557558
     559                <ibis:include href="dimension/Hispanic.xml"/>
     560                <ibis:include href="dimension/SexOrientCat.xml"/>
     561                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     562                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     563                <ibis:include href="dimension/TransgenderCat.xml"/>
     564                <ibis:include href="dimension/SexGenMinnority.xml"/>
     565
    558566        </DIMENSIONS>
    559567</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/SchoolUnsafeHS.xml

    r21383 r21468  
    311311                        <ibis:include href="section/Sex.xml"/>
    312312                        <ibis:include href="section/RaceEth.xml"/>
     313                        <ibis:include href="section/OtherDemographics.xml"/>
    313314                </SECTIONS>
    314315       
     
    333334                <ibis:include href="dimension/PrgRace.xml"/>
    334335
     336                <ibis:include href="dimension/Hispanic.xml"/>
     337                <ibis:include href="dimension/SexOrientCat.xml"/>
     338                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     339                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     340                <ibis:include href="dimension/TransgenderCat.xml"/>
     341                <ibis:include href="dimension/SexGenMinnority.xml"/>
     342
    335343        </DIMENSIONS>
    336344</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/SchoolUnsafeMS.xml

    r21383 r21468  
    308308                        <ibis:include href="section/Sex.xml"/>
    309309                        <ibis:include href="section/RaceEth.xml"/>
     310                        <ibis:include href="section/OtherDemographics.xml"/>
    310311                </SECTIONS>
    311312       
     
    329330                <ibis:include href="dimension/PrgRace.xml"/>
    330331
     332                <ibis:include href="dimension/Hispanic.xml"/>
     333                <ibis:include href="dimension/SexOrientCat.xml"/>
     334                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     335                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     336                <ibis:include href="dimension/TransgenderCat.xml"/>
     337                <ibis:include href="dimension/SexGenMinnority.xml"/>
     338
    331339        </DIMENSIONS>
    332340</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/ScrnTime2Hr.xml

    r21444 r21468  
    500500                        <ibis:include href="section/Sex.xml"/>
    501501                        <ibis:include href="section/RaceEth.xml"/>
     502                        <ibis:include href="section/OtherDemographics.xml"/>
    502503                </SECTIONS>
    503504       
     
    521522                <ibis:include href="dimension/PrgRace.xml"/>
    522523
     524                <ibis:include href="dimension/Hispanic.xml"/>
     525                <ibis:include href="dimension/SexOrientCat.xml"/>
     526                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     527                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     528                <ibis:include href="dimension/TransgenderCat.xml"/>
     529                <ibis:include href="dimension/SexGenMinnority.xml"/>
     530
    523531        </DIMENSIONS>
    524532</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/ScrnTime4Cat.xml

    r21444 r21468  
    497497                        <ibis:include href="section/Sex.xml"/>
    498498                        <ibis:include href="section/RaceEth.xml"/>
     499                        <ibis:include href="section/OtherDemographics.xml"/>
    499500                </SECTIONS>
    500501       
     
    518519                <ibis:include href="dimension/PrgRace.xml"/>
    519520
     521                <ibis:include href="dimension/Hispanic.xml"/>
     522                <ibis:include href="dimension/SexOrientCat.xml"/>
     523                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     524                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     525                <ibis:include href="dimension/TransgenderCat.xml"/>
     526                <ibis:include href="dimension/SexGenMinnority.xml"/>
     527
    520528        </DIMENSIONS>
    521529</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/ScrnTime4CatAny.xml

    r21444 r21468  
    536536                        <ibis:include href="section/Sex.xml"/>
    537537                        <ibis:include href="section/RaceEth.xml"/>
     538                        <ibis:include href="section/OtherDemographics.xml"/>
    538539                </SECTIONS>
    539540       
     
    557558                <ibis:include href="dimension/PrgRace.xml"/>
    558559
     560                <ibis:include href="dimension/Hispanic.xml"/>
     561                <ibis:include href="dimension/SexOrientCat.xml"/>
     562                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     563                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     564                <ibis:include href="dimension/TransgenderCat.xml"/>
     565                <ibis:include href="dimension/SexGenMinnority.xml"/>
     566
    559567        </DIMENSIONS>
    560568</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/SeeDent12Mo.xml

    r21383 r21468  
    536536                        <ibis:include href="section/Sex.xml"/>
    537537                        <ibis:include href="section/RaceEth.xml"/>
     538                        <ibis:include href="section/OtherDemographics.xml"/>
    538539                </SECTIONS>
    539540       
     
    558559                <ibis:include href="dimension/PrgRace.xml"/>
    559560
     561                <ibis:include href="dimension/Hispanic.xml"/>
     562                <ibis:include href="dimension/SexOrientCat.xml"/>
     563                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     564                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     565                <ibis:include href="dimension/TransgenderCat.xml"/>
     566                <ibis:include href="dimension/SexGenMinnority.xml"/>
     567
    560568        </DIMENSIONS>
    561569</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/SeeDr12Mo.xml

    r21383 r21468  
    543543                        <ibis:include href="section/Sex.xml"/>
    544544                        <ibis:include href="section/RaceEth.xml"/>
     545                        <ibis:include href="section/OtherDemographics.xml"/>
    545546                </SECTIONS>
    546547       
     
    566567                <ibis:include href="dimension/PrgRace.xml"/>
    567568
     569                <ibis:include href="dimension/Hispanic.xml"/>
     570                <ibis:include href="dimension/SexOrientCat.xml"/>
     571                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     572                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     573                <ibis:include href="dimension/TransgenderCat.xml"/>
     574                <ibis:include href="dimension/SexGenMinnority.xml"/>
     575
    568576        </DIMENSIONS>
    569577</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/SelfHurt12M.xml

    r21383 r21468  
    304304                        <ibis:include href="section/Sex.xml"/>
    305305                        <ibis:include href="section/RaceEth.xml"/>
     306                        <ibis:include href="section/OtherDemographics.xml"/>
    306307                </SECTIONS>
    307308       
     
    326327                <ibis:include href="dimension/PrgRace.xml"/>
    327328
     329                <ibis:include href="dimension/Hispanic.xml"/>
     330                <ibis:include href="dimension/SexOrientCat.xml"/>
     331                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     332                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     333                <ibis:include href="dimension/TransgenderCat.xml"/>
     334                <ibis:include href="dimension/SexGenMinnority.xml"/>
     335
    328336        </DIMENSIONS>
    329337</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/SelfHurtEver.xml

    r21383 r21468  
    302302                        <ibis:include href="section/Sex.xml"/>
    303303                        <ibis:include href="section/RaceEth.xml"/>
     304                        <ibis:include href="section/OtherDemographics.xml"/>
    304305                </SECTIONS>
    305306       
     
    324325                <ibis:include href="dimension/PrgRace.xml"/>
    325326
     327                <ibis:include href="dimension/Hispanic.xml"/>
     328                <ibis:include href="dimension/SexOrientCat.xml"/>
     329                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     330                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     331                <ibis:include href="dimension/TransgenderCat.xml"/>
     332                <ibis:include href="dimension/SexGenMinnority.xml"/>
     333
    326334        </DIMENSIONS>
    327335</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/Sex4PlusInLife.xml

    r21382 r21468  
    526526                        <ibis:include href="section/Sex.xml"/>
    527527                        <ibis:include href="section/RaceEth.xml"/>
     528                        <ibis:include href="section/OtherDemographics.xml"/>
    528529                </SECTIONS>
    529530       
     
    548549                <ibis:include href="dimension/PrgRace.xml"/>
    549550
     551                <ibis:include href="dimension/Hispanic.xml"/>
     552                <ibis:include href="dimension/SexOrientCat.xml"/>
     553                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     554                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     555                <ibis:include href="dimension/TransgenderCat.xml"/>
     556                <ibis:include href="dimension/SexGenMinnority.xml"/>
     557
    550558        </DIMENSIONS>
    551559</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/SexB413.xml

    r21382 r21468  
    527527                        <ibis:include href="section/Sex.xml"/>
    528528                        <ibis:include href="section/RaceEth.xml"/>
     529                        <ibis:include href="section/OtherDemographics.xml"/>
    529530                </SECTIONS>
    530531       
     
    550551                <ibis:include href="dimension/PrgRace.xml"/>
    551552
     553                <ibis:include href="dimension/Hispanic.xml"/>
     554                <ibis:include href="dimension/SexOrientCat.xml"/>
     555                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     556                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     557                <ibis:include href="dimension/TransgenderCat.xml"/>
     558                <ibis:include href="dimension/SexGenMinnority.xml"/>
     559
    552560        </DIMENSIONS>
    553561</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/SexCond3M.xml

    r21382 r21468  
    311311                        <ibis:include href="section/Sex.xml"/>
    312312                        <ibis:include href="section/RaceEth.xml"/>
     313                        <ibis:include href="section/OtherDemographics.xml"/>
    313314                </SECTIONS>
    314315       
     
    332333                <ibis:include href="dimension/PrgRace.xml"/>
    333334
     335                <ibis:include href="dimension/Hispanic.xml"/>
     336                <ibis:include href="dimension/SexOrientCat.xml"/>
     337                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     338                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     339                <ibis:include href="dimension/TransgenderCat.xml"/>
     340                <ibis:include href="dimension/SexGenMinnority.xml"/>
     341
    334342        </DIMENSIONS>
    335343</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/SexContactGenderCat.xml

    r21382 r21468  
    278278                        <ibis:include href="section/Sex.xml"/>
    279279                        <ibis:include href="section/RaceEth.xml"/>
     280                        <ibis:include href="section/OtherDemographics.xml"/>
    280281                </SECTIONS>
    281282       
     
    299300                <ibis:include href="dimension/PrgRace.xml"/>
    300301
     302                <ibis:include href="dimension/Hispanic.xml"/>
     303                <ibis:include href="dimension/SexOrientCat.xml"/>
     304                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     305                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     306                <ibis:include href="dimension/TransgenderCat.xml"/>
     307                <ibis:include href="dimension/SexGenMinnority.xml"/>
     308
    301309        </DIMENSIONS>
    302310</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/SexContactGenderCatAny.xml

    r21382 r21468  
    307307                        <ibis:include href="section/Sex.xml"/>
    308308                        <ibis:include href="section/RaceEth.xml"/>
     309                        <ibis:include href="section/OtherDemographics.xml"/>
    309310                </SECTIONS>
    310311       
     
    328329                <ibis:include href="dimension/PrgRace.xml"/>
    329330
     331                <ibis:include href="dimension/Hispanic.xml"/>
     332                <ibis:include href="dimension/SexOrientCat.xml"/>
     333                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     334                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     335                <ibis:include href="dimension/TransgenderCat.xml"/>
     336                <ibis:include href="dimension/SexGenMinnority.xml"/>
     337
    330338        </DIMENSIONS>
    331339</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/SexDrugsAlch.xml

    r21382 r21468  
    311311                        <ibis:include href="section/Sex.xml"/>
    312312                        <ibis:include href="section/RaceEth.xml"/>
     313                        <ibis:include href="section/OtherDemographics.xml"/>
    313314                </SECTIONS>
    314315       
     
    332333                <ibis:include href="dimension/PrgRace.xml"/>
    333334
     335                <ibis:include href="dimension/Hispanic.xml"/>
     336                <ibis:include href="dimension/SexOrientCat.xml"/>
     337                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     338                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     339                <ibis:include href="dimension/TransgenderCat.xml"/>
     340                <ibis:include href="dimension/SexGenMinnority.xml"/>
     341
    334342        </DIMENSIONS>
    335343</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/SexEver.xml

    r21445 r21468  
    528528                        <ibis:include href="section/Sex.xml"/>
    529529                        <ibis:include href="section/RaceEth.xml"/>
     530                        <ibis:include href="section/OtherDemographics.xml"/>
    530531                </SECTIONS>
    531532       
     
    550551                <ibis:include href="dimension/PrgRace.xml"/>
    551552
     553                <ibis:include href="dimension/Hispanic.xml"/>
     554                <ibis:include href="dimension/SexOrientCat.xml"/>
     555                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     556                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     557                <ibis:include href="dimension/TransgenderCat.xml"/>
     558                <ibis:include href="dimension/SexGenMinnority.xml"/>
     559
    552560        </DIMENSIONS>
    553561</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/SexEverCond.xml

    r21382 r21468  
    514514                        <ibis:include href="section/Sex.xml"/>
    515515                        <ibis:include href="section/RaceEth.xml"/>
     516                        <ibis:include href="section/OtherDemographics.xml"/>
    516517                </SECTIONS>
    517518       
     
    536537                <ibis:include href="dimension/PrgRace.xml"/>
    537538
     539                <ibis:include href="dimension/Hispanic.xml"/>
     540                <ibis:include href="dimension/SexOrientCat.xml"/>
     541                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     542                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     543                <ibis:include href="dimension/TransgenderCat.xml"/>
     544                <ibis:include href="dimension/SexGenMinnority.xml"/>
     545
    538546        </DIMENSIONS>
    539547</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/SexExpect.xml

    r21382 r21468  
    529529                        <ibis:include href="section/Sex.xml"/>
    530530                        <ibis:include href="section/RaceEth.xml"/>
     531                        <ibis:include href="section/OtherDemographics.xml"/>
    531532                </SECTIONS>
    532533       
     
    550551                <ibis:include href="dimension/PrgRace.xml"/>
    551552
     553                <ibis:include href="dimension/Hispanic.xml"/>
     554                <ibis:include href="dimension/SexOrientCat.xml"/>
     555                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     556                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     557                <ibis:include href="dimension/TransgenderCat.xml"/>
     558                <ibis:include href="dimension/SexGenMinnority.xml"/>
     559
    552560        </DIMENSIONS>
    553561</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/SexForced.xml

    r21383 r21468  
    530530                        <ibis:include href="section/Sex.xml"/>
    531531                        <ibis:include href="section/RaceEth.xml"/>
     532                        <ibis:include href="section/OtherDemographics.xml"/>
    532533                </SECTIONS>
    533534       
     
    553554                <ibis:include href="dimension/PrgRace.xml"/>
    554555
     556                <ibis:include href="dimension/Hispanic.xml"/>
     557                <ibis:include href="dimension/SexOrientCat.xml"/>
     558                <ibis:include href="dimension/SexOrient4Cat.xml"/>
     559                <ibis:include href="dimension/SexOrientGendCat.xml"/>
     560                <ibis:include href="dimension/TransgenderCat.xml"/>
     561                <ibis:include href="dimension/SexGenMinnority.xml"/>
     562
    555563        </DIMENSIONS>
    556564</QUERY_MODULE>
  • adopters/hi/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrbs/SexGenMinorityInd.xml

    r21445 r21468  
    2121-->
    2222        <ibis:doc>
    23                 <name>query/module/yrbs/SexGenMinority.xml</name>
     23                <name>query/module/yrbs/SexGenMinorityInd.xml</name>
    2424                <summary>Query Module definition</summary>
    2525                <description/>
     
    2828        </ibis:doc>
    2929
    30         <NAME>SexGenMinority</NAME> <!-- We are using the Indicator Dimension name -->
     30        <NAME>SexGenMinorityInd</NAME> <!-- We are using the Indicator Dimension name -->
    3131        <TITLE>Hawaii's Youth Risk Behavior Survey (YRBS) Data</TITLE>
    3232        <DESCRIPTION>Hawaii YRBS Data</DESCRIPTION>
     
    4949                <PARAMETER>
    5050                        <NAME>spvar1</NAME>
    51                         <VALUE>SEXGENMINORTY</VALUE> <!-- SAS VAR name that gets inserted in the .def file -->
     51                        <VALUE>SEXGENMININD</VALUE> <!-- SAS VAR name that gets inserted in the .def file -->
    5252                </PARAMETER>
    5353                <PARAMETER>
    5454                        <NAME>filter_exclude</NAME>
    55                         <VALUE>SexGenMinority</VALUE> <!-- Dimension Name -->
     55                        <VALUE>SexGenMinorityInd</VALUE> <!-- Dimension Name -->
    5656                </PARAMETER>
    5757                <PARAMETER>
    5858                        <NAME>spvar2</NAME>
    59                         <VALUE>%SexGenMinority%</VALUE> <!-- Dimension Value Selected by the User -->
     59                        <VALUE>%SexGenMinorityInd%</VALUE> <!-- Dimension Value Selected by the User -->
    6060                </PARAMETER>
    6161        </PARAMETERS>
     
    6868        <CONFIGURATIONS>
    6969
    70                 <CONFIGURATION><NAME>SexGenMinority_HS_ST</NAME>
     70                <CONFIGURATION><NAME>SexGenMinorityInd_HS_ST</NAME>
    7171                        <TITLE>Sexual or gender minority students, High Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
    72                         <DESCRIPTION><ibis:include href="text/SexGenMinority.xml"/></DESCRIPTION>
     72                        <DESCRIPTION><ibis:include href="text/SexGenMinorityInd.xml"/></DESCRIPTION>
    7373                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
    7474                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
     
    7878                                        <NAME>Percent</NAME>
    7979                                        <TITLE>Sexual or gender minority students</TITLE>  <!-- Short Title, this is the Map Legend, Chart Title and Data Table column Title -->
    80                                         <DESCRIPTION><ibis:include href="text/SexGenMinority.xml"/></DESCRIPTION>
     80                                        <DESCRIPTION><ibis:include href="text/SexGenMinorityInd.xml"/></DESCRIPTION>
    8181                                        <XSLT_FORMAT_PATTERN>0.0'%'</XSLT_FORMAT_PATTERN>
    8282                                        <NUMERATOR>
     
    129129                        <DATA_NOTES>
    130130                                <DATA_NOTE><TITLE>Question Wording:</TITLE>
    131                                         <ibis:include href="text/SexGenMinority.xml"/>
     131                                        <ibis:include href="text/SexGenMinorityInd.xml"/>
    132132                                </DATA_NOTE>
    133133                                <ibis:include href="data_note/RedFlag.xml"/>
     
    165165                </CONFIGURATION>
    166166
    167                 <CONFIGURATION><NAME>SexGenMinority_HS_CNTY</NAME>
     167                <CONFIGURATION><NAME>SexGenMinorityInd_HS_CNTY</NAME>
    168168                        <TITLE>Sexual or gender minority students, High Schools, County-level</TITLE><!-- Short Title, - this is the title on the Query Builder page -->
    169                         <DESCRIPTION><ibis:include hre