merge from 1.7.3.5(r13153:r13167)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545

modules/module/queries/getAllMobileSkinSetModule.xml

@@ -0,0 +1,11 @@
+<query id="getAllMobileSkinSetModule" action="select">
+    <tables>
+        <table name="modules" />
+    </tables>
+    <columns>
+        <column name="module_srl" />
+    </columns>
+    <conditions>
+        <condition operation="notequal" column="mskin" default=" " />
+    </conditions>
+</query>

modules/module/queries/getLangListByLangcode.xml

@@ -10,6 +10,7 @@
         <condition operation="equal" column="site_srl" var="site_srl" notnull="notnull" filter="number" />
         <condition operation="in" column="lang_code" var="langCode" pipe="and" />
 		<condition operation="like" column="value" var="search_keyword" pipe="and" />
+		<condition operation="equal" column="name" var="name" pipe="and" />
     </conditions>
     <navigation>
         <index var="sort_index" default="list_order" order="order_type" />

modules/module/queries/getModuleInfoByMenuItemSrl.xml

@@ -0,0 +1,18 @@
+<query id="getModuleInfoByMenuItemSrl" action="select">
+    <tables>
+        <table name="modules" />
+    </tables>
+    <conditions>
+		<query operation="equal" column="mid" notnull="notnull" alias="getMidByMenuSrl">
+			<tables>
+				<table name="menu_item" alias="menu_item"/>
+			</tables>
+			<columns>
+				<column name="url" />
+			</columns>
+			<conditions>
+        		<condition operation="equal" column="menu_item.menu_item_srl" var="menu_item_srl" notnull="notnull" />
+			</conditions>
+		</query>
+    </conditions>
+</query>

modules/module/queries/getModuleListByInstance.xml

@@ -4,6 +4,7 @@
     </tables>
     <columns>
         <column name="*" />
+        <column name="count(module_srl)" alias="instanceCount" />
     </columns>
 	<conditions>
 		<condition operation="equal" column="site_srl" var="site_srl" filter="number" />

modules/module/queries/getNotLinkedModuleBySiteSrl.xml

@@ -0,0 +1,12 @@
+<query id="getNotLinkedModuleBySiteSrl" action="select">
+    <tables>
+        <table name="modules" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="menu_srl" default="0" />
+        <condition operation="equal" column="site_srl" var="site_srl" default="0" notnull="notnull" pipe="and" />
+    </conditions>
+</query>

modules/module/queries/getSiteInfo.xml

@@ -17,7 +17,9 @@
         <column name="modules.use_mobile" alias="use_mobile" />
         <column name="modules.menu_srl" alias="menu_srl" />
         <column name="modules.mid" alias="mid" />
+        <column name="modules.is_skin_fix" alias="is_skin_fix" />
         <column name="modules.skin" alias="skin" />
+        <column name="modules.is_mskin_fix" alias="is_mskin_fix" />
         <column name="modules.mskin" alias="mskin" />
         <column name="modules.browser_title" alias="browser_title" />
         <column name="modules.description" alias="description" />

modules/module/queries/insertModule.xml

@@ -8,7 +8,8 @@
         <column name="module_category_srl" var="module_category_srl" default="0" />
         <column name="mid" var="mid" notnull="notnull" minlength="1" maxlength="40" />
         <column name="skin" var="skin" minlength="1" maxlength="250" />
-        <column name="is_skin_fix" var="is_skin_fix" default="Y" />
+        <column name="is_skin_fix" var="is_skin_fix" default="N" />
+        <column name="is_mskin_fix" var="is_mskin_fix" default="N" />
         <column name="mskin" var="mskin"  />
         <column name="browser_title" var="browser_title" notnull="notnull" minlength="1" maxlength="250" />
         <column name="layout_srl" var="layout_srl" />

modules/module/queries/updateMobileSkinFixModules.xml

@@ -0,0 +1,12 @@
+<query id="updateMobileSkinFixModules" action="update">
+    <tables>
+        <table name="modules" />
+    </tables>
+    <columns>
+		<column name="is_mskin_fix" default="Y" />
+    </columns>
+    <conditions>
+        <condition operation="notnull" column="mskin" />
+        <condition operation="notequal" column="mskin" default=" " pipe="or" />
+    </conditions>
+</query>

modules/module/queries/updateModule.xml

@@ -7,8 +7,9 @@
         <column name="module_category_srl" var="module_category_srl" />
         <column name="layout_srl" var="layout_srl" />
         <column name="skin" var="skin" minlength="0" maxlength="250" />
-        <column name="is_skin_fix" var="is_skin_fix" default="Y" />
+        <column name="is_skin_fix" var="is_skin_fix" default="N" />
         <column name="mskin" var="mskin" />
+        <column name="is_mskin_fix" var="is_mskin_fix" default="N" />
         <column name="menu_srl" var="menu_srl" filter="number" />
         <column name="mid" var="mid" notnull="notnull" minlength="1" maxlength="40" />
         <column name="browser_title" var="browser_title" notnull="notnull" minlength="1" maxlength="250" />

modules/module/queries/updateSkinFixModules.xml

@@ -3,9 +3,10 @@
         <table name="modules" />
     </tables>
     <columns>
-        <column name="is_skin_fix" var="is_skin_fix" />
+        <column name="is_skin_fix" default="Y" />
     </columns>
     <conditions>
-        <condition operation="in" column="module_srl" var="module_srls" notnull="notnull" />
+        <condition operation="notnull" column="skin" />
+        <condition operation="notequal" column="skin" default=" " pipe="or" />
     </conditions>
 </query>