[kateglo] r476 committed - CPanel Synonym Antonym Relation
kat...@googlecode.com
Author: arthur.purnama
Date: Thu Jan 26 09:11:22 2012
Log: CPanel Synonym Antonym Relation
http://code.google.com/p/kateglo/source/detail?r=476
Modified:
/branches/kateglox/.idea/workspace.xml
/branches/kateglox/application/daos/Entry.php
/branches/kateglox/application/daos/Meaning.php
/branches/kateglox/application/daos/Search.php
/branches/kateglox/application/daos/interfaces/Meaning.php
/branches/kateglox/application/models/Clazz.php
/branches/kateglox/application/models/Definition.php
/branches/kateglox/application/models/Meaning.php
/branches/kateglox/application/models/Misspelled.php
/branches/kateglox/application/models/Relation.php
/branches/kateglox/application/models/Source.php
/branches/kateglox/application/models/Synonym.php
/branches/kateglox/application/models/Type.php
/branches/kateglox/application/modules/cpanel/controllers/CariController.php
/branches/kateglox/application/modules/cpanel/controllers/EntriController.php
/branches/kateglox/application/services/Meaning.php
/branches/kateglox/application/services/interfaces/Meaning.php
/branches/kateglox/public/javascripts/cpanel/modules/entry/forms/MeaningComboBox.js
/branches/kateglox/public/javascripts/cpanel/modules/entry/panels/Antonym.js
/branches/kateglox/public/javascripts/cpanel/modules/entry/panels/Relation.js
/branches/kateglox/public/javascripts/cpanel/modules/entry/panels/Synonym.js
/branches/kateglox/public/javascripts/cpanel/stores/Meaning.js
/branches/kateglox/tools/luceneindexing.php
=======================================
--- /branches/kateglox/.idea/workspace.xml Wed Jan 25 08:41:07 2012
+++ /branches/kateglox/.idea/workspace.xml Thu Jan 26 09:11:22 2012
@@ -6,10 +6,28 @@
<component name="ChangeListManager">
<list default="true" readonly="true"
id="91a7700a-3500-457a-96ed-4f7a08fd1085" name="Default" comment="">
<change type="MODIFICATION"
beforePath="$PROJECT_DIR$/.idea/workspace.xml"
afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/application/configs/Binder.php"
afterPath="$PROJECT_DIR$/application/configs/Binder.php" />
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/application/daos/Entry.php"
afterPath="$PROJECT_DIR$/application/daos/Entry.php" />
<change type="MODIFICATION"
beforePath="$PROJECT_DIR$/application/daos/Meaning.php"
afterPath="$PROJECT_DIR$/application/daos/Meaning.php" />
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/application/daos/Search.php"
afterPath="$PROJECT_DIR$/application/daos/Search.php" />
<change type="MODIFICATION"
beforePath="$PROJECT_DIR$/application/daos/interfaces/Meaning.php"
afterPath="$PROJECT_DIR$/application/daos/interfaces/Meaning.php" />
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/application/models/Clazz.php"
afterPath="$PROJECT_DIR$/application/models/Clazz.php" />
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/application/models/Definition.php"
afterPath="$PROJECT_DIR$/application/models/Definition.php" />
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/application/models/Meaning.php"
afterPath="$PROJECT_DIR$/application/models/Meaning.php" />
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/application/models/Misspelled.php"
afterPath="$PROJECT_DIR$/application/models/Misspelled.php" />
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/application/models/Relation.php"
afterPath="$PROJECT_DIR$/application/models/Relation.php" />
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/application/models/Source.php"
afterPath="$PROJECT_DIR$/application/models/Source.php" />
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/application/models/Synonym.php"
afterPath="$PROJECT_DIR$/application/models/Synonym.php" />
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/application/models/Type.php"
afterPath="$PROJECT_DIR$/application/models/Type.php" />
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/application/modules/cpanel/controllers/CariController.php"
afterPath="$PROJECT_DIR$/application/modules/cpanel/controllers/CariController.php"
/>
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/application/modules/cpanel/controllers/EntriController.php"
afterPath="$PROJECT_DIR$/application/modules/cpanel/controllers/EntriController.php"
/>
<change type="MODIFICATION"
beforePath="$PROJECT_DIR$/application/services/Meaning.php"
afterPath="$PROJECT_DIR$/application/services/Meaning.php" />
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/application/services/interfaces/Meaning.php"
afterPath="$PROJECT_DIR$/application/services/interfaces/Meaning.php" />
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/public/javascripts/cpanel/modules/entry/forms/MeaningComboBox.js"
afterPath="$PROJECT_DIR$/public/javascripts/cpanel/modules/entry/forms/MeaningComboBox.js"
/>
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/public/javascripts/cpanel/modules/entry/panels/Antonym.js"
afterPath="$PROJECT_DIR$/public/javascripts/cpanel/modules/entry/panels/Antonym.js"
/>
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/public/javascripts/cpanel/modules/entry/panels/Relation.js"
afterPath="$PROJECT_DIR$/public/javascripts/cpanel/modules/entry/panels/Relation.js"
/>
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/public/javascripts/cpanel/modules/entry/panels/Synonym.js"
afterPath="$PROJECT_DIR$/public/javascripts/cpanel/modules/entry/panels/Synonym.js"
/>
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/public/javascripts/cpanel/stores/Meaning.js"
afterPath="$PROJECT_DIR$/public/javascripts/cpanel/stores/Meaning.js" />
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/tools/luceneindexing.php"
afterPath="$PROJECT_DIR$/tools/luceneindexing.php" />
</list>
<ignored path="kateglo.iws" />
<ignored path=".idea/workspace.xml" />
@@ -31,64 +49,64 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="Type.php" pinned="false" current="false"
current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/application/daos/Type.php">
+ <file leaf-file-name="CariController.php" pinned="false"
current="false" current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/application/modules/cpanel/controllers/CariController.php">
<provider selected="true" editor-type-id="text-editor">
- <state line="95" column="42" selection-start="3382"
selection-end="3382" vertical-scroll-proportion="0.0">
+ <state line="298" column="73" selection-start="11046"
selection-end="11046" vertical-scroll-proportion="-49.96">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Type.js" pinned="false" current="false"
current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/public/javascripts/cpanel/modules/entry/forms/Type.js">
+ <file leaf-file-name="Meaning.php" pinned="false" current="false"
current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/application/services/interfaces/Meaning.php">
<provider selected="true" editor-type-id="text-editor">
- <state line="28" column="56" selection-start="1290"
selection-end="1290" vertical-scroll-proportion="0.0">
+ <state line="34" column="10" selection-start="1569"
selection-end="1569" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="EntityManager.php" pinned="false"
current="false" current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/application/providers/EntityManager.php">
+ <file leaf-file-name="Synonym.js" pinned="false" current="true"
current-in-tab="true">
+ <entry
file="file://$PROJECT_DIR$/public/javascripts/cpanel/modules/entry/panels/Synonym.js">
<provider selected="true" editor-type-id="text-editor">
- <state line="35" column="76" selection-start="1649"
selection-end="1649" vertical-scroll-proportion="0.0">
+ <state line="29" column="70" selection-start="1355"
selection-end="1355" vertical-scroll-proportion="0.5583239">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Type.php" pinned="false" current="false"
current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/application/models/Type.php">
+ <file leaf-file-name="Relation.js" pinned="false" current="false"
current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/public/javascripts/cpanel/modules/entry/panels/Relation.js">
<provider selected="true" editor-type-id="text-editor">
- <state line="173" column="15" selection-start="4498"
selection-end="4498" vertical-scroll-proportion="0.0">
+ <state line="3" column="20" selection-start="126"
selection-end="126" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Binder.php" pinned="false" current="false"
current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/application/configs/Binder.php">
+ <file leaf-file-name="Equivalent.js" pinned="false" current="false"
current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/public/javascripts/cpanel/modules/entry/panels/Equivalent.js">
<provider selected="true" editor-type-id="text-editor">
- <state line="51" column="86" selection-start="2130"
selection-end="2130" vertical-scroll-proportion="0.0">
+ <state line="0" column="0" selection-start="0"
selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Meaning.php" pinned="false" current="false"
current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/application/models/Meaning.php">
+ <file leaf-file-name="Antonym.js" pinned="false" current="false"
current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/public/javascripts/cpanel/modules/entry/panels/Antonym.js">
<provider selected="true" editor-type-id="text-editor">
- <state line="245" column="9" selection-start="6719"
selection-end="6719" vertical-scroll-proportion="0.0">
+ <state line="16" column="57" selection-start="706"
selection-end="706" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Meaning.php" pinned="false" current="false"
current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/application/daos/Meaning.php">
+ <entry
file="file://$PROJECT_DIR$/application/services/Meaning.php">
<provider selected="true" editor-type-id="text-editor">
- <state line="43" column="38" selection-start="1989"
selection-end="1989" vertical-scroll-proportion="0.0">
+ <state line="38" column="41" selection-start="1724"
selection-end="1724" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -97,21 +115,30 @@
<file leaf-file-name="Meaning.php" pinned="false" current="false"
current-in-tab="false">
<entry
file="file://$PROJECT_DIR$/application/daos/interfaces/Meaning.php">
<provider selected="true" editor-type-id="text-editor">
- <state line="55" column="2" selection-start="1989"
selection-end="1989" vertical-scroll-proportion="0.0">
+ <state line="70" column="24" selection-start="2397"
selection-end="2397" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Meaning.php" pinned="false" current="true"
current-in-tab="true">
- <entry
file="file://$PROJECT_DIR$/application/services/Meaning.php">
+ <file leaf-file-name="Meaning.php" pinned="false" current="false"
current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/application/daos/Meaning.php">
<provider selected="true" editor-type-id="text-editor">
- <state line="130" column="0" selection-start="3866"
selection-end="3866" vertical-scroll-proportion="0.38505095">
+ <state line="158" column="63" selection-start="5954"
selection-end="5954" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
+ <file leaf-file-name="MeaningComboBox.js" pinned="false"
current="false" current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/public/javascripts/cpanel/modules/entry/forms/MeaningComboBox.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="32" column="51" selection-start="1390"
selection-end="1390" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
</leaf>
</component>
<component name="FindManager">
@@ -132,14 +159,11 @@
<option
value="$PROJECT_DIR$/public/javascripts/cpanel/menus/SearchEquivalent.js" />
<option
value="$PROJECT_DIR$/public/javascripts/cpanel/menus/SearchEntry.js" />
<option
value="$PROJECT_DIR$/application/daos/interfaces/Search.php" />
- <option value="$PROJECT_DIR$/application/daos/Search.php" />
<option
value="$PROJECT_DIR$/public/javascripts/cpanel/stores/search/Source.js" />
<option value="$PROJECT_DIR$/public/javascripts/cpanel/main.js" />
<option
value="$PROJECT_DIR$/public/javascripts/cpanel/menus/SearchSource.js" />
- <option value="$PROJECT_DIR$/application/models/Source.php" />
<option value="$PROJECT_DIR$/application/services/Search.php" />
<option value="$PROJECT_DIR$/public/index.php" />
- <option
value="$PROJECT_DIR$/application/modules/cpanel/controllers/CariController.php"
/>
<option
value="$PROJECT_DIR$/public/javascripts/cpanel/modules/entry/tree/Explorer.js"
/>
<option
value="$PROJECT_DIR$/public/javascripts/cpanel/grids/MenuSearchResult.js" />
<option
value="$PROJECT_DIR$/public/javascripts/cpanel/forms/NewEntry.js" />
@@ -155,19 +179,33 @@
<option
value="$PROJECT_DIR$/application/daos/exceptions/DomainStateException.php"
/>
<option value="$PROJECT_DIR$/application/services/Entry.php" />
<option
value="$PROJECT_DIR$/application/services/interfaces/Entry.php" />
- <option
value="$PROJECT_DIR$/application/services/interfaces/Meaning.php" />
<option value="$PROJECT_DIR$/application/daos/interfaces/Type.php"
/>
- <option value="$PROJECT_DIR$/application/daos/Entry.php" />
<option value="$PROJECT_DIR$/application/utilities/REST.php" />
<option value="$PROJECT_DIR$/application/daos/Type.php" />
- <option
value="$PROJECT_DIR$/application/modules/cpanel/controllers/EntriController.php"
/>
- <option value="$PROJECT_DIR$/application/models/Meaning.php" />
- <option value="$PROJECT_DIR$/application/models/Type.php" />
<option
value="$PROJECT_DIR$/public/javascripts/cpanel/modules/entry/forms/Type.js"
/>
<option value="$PROJECT_DIR$/application/configs/Binder.php" />
- <option value="$PROJECT_DIR$/application/daos/Meaning.php" />
- <option
value="$PROJECT_DIR$/application/daos/interfaces/Meaning.php" />
+ <option value="$PROJECT_DIR$/application/models/Relation.php" />
+ <option value="$PROJECT_DIR$/application/models/Meaning.php" />
+ <option value="$PROJECT_DIR$/application/models/Synonym.php" />
+ <option value="$PROJECT_DIR$/application/models/Misspelled.php" />
+ <option value="$PROJECT_DIR$/application/models/Definition.php" />
+ <option value="$PROJECT_DIR$/application/models/Clazz.php" />
+ <option value="$PROJECT_DIR$/application/models/Type.php" />
+ <option value="$PROJECT_DIR$/application/models/Source.php" />
+ <option value="$PROJECT_DIR$/tools/luceneindexing.php" />
+ <option value="$PROJECT_DIR$/application/daos/Entry.php" />
+ <option
value="$PROJECT_DIR$/public/javascripts/cpanel/stores/Meaning.js" />
+ <option
value="$PROJECT_DIR$/application/modules/cpanel/controllers/EntriController.php"
/>
+ <option value="$PROJECT_DIR$/application/daos/Search.php" />
+ <option
value="$PROJECT_DIR$/public/javascripts/cpanel/modules/entry/panels/Relation.js"
/>
+ <option
value="$PROJECT_DIR$/public/javascripts/cpanel/modules/entry/panels/Antonym.js"
/>
+ <option
value="$PROJECT_DIR$/application/modules/cpanel/controllers/CariController.php"
/>
+ <option
value="$PROJECT_DIR$/application/services/interfaces/Meaning.php" />
<option value="$PROJECT_DIR$/application/services/Meaning.php" />
+ <option
value="$PROJECT_DIR$/application/daos/interfaces/Meaning.php" />
+ <option value="$PROJECT_DIR$/application/daos/Meaning.php" />
+ <option
value="$PROJECT_DIR$/public/javascripts/cpanel/modules/entry/forms/MeaningComboBox.js"
/>
+ <option
value="$PROJECT_DIR$/public/javascripts/cpanel/modules/entry/panels/Synonym.js"
/>
</list>
</option>
</component>
@@ -258,6 +296,10 @@
<option name="myItemId" value="External Libraries" />
<option name="myItemType"
value="com.jetbrains.php.config.PhpExternalLibrariesNodePatcher$PatchedExternalLibrariesNode"
/>
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PHP 5.3.2-1ubuntu4.9" />
+ <option name="myItemType"
value="com.jetbrains.php.config.PhpExternalLibrariesNodePatcher$PatchedLibraryNode"
/>
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -324,6 +366,32 @@
</PATH_ELEMENT>
</PATH>
<PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="kateglo" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="kateglo" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="public" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="javascripts" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="cpanel" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="stores" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
<PATH_ELEMENT>
<option name="myItemId" value="kateglo" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
@@ -409,7 +477,7 @@
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="forms" />
+ <option name="myItemId" value="tree" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -423,9 +491,29 @@
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="application" />
+ <option name="myItemId" value="public" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="javascripts" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="cpanel" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="modules" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="entry" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="panels" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -437,13 +525,29 @@
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="application" />
+ <option name="myItemId" value="public" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="utilities" />
+ <option name="myItemId" value="javascripts" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="cpanel" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="modules" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="entry" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="grids" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -455,13 +559,29 @@
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="application" />
+ <option name="myItemId" value="public" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="services" />
+ <option name="myItemId" value="javascripts" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="cpanel" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="modules" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="entry" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="forms" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -476,14 +596,24 @@
<option name="myItemId" value="application" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ </PATH>
+ <PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="services" />
+ <option name="myItemId" value="kateglo" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="kateglo" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="interfaces" />
+ <option name="myItemId" value="application" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="services" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -499,9 +629,13 @@
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="providers" />
+ <option name="myItemId" value="services" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="interfaces" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -627,6 +761,28 @@
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="kateglo" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="kateglo" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="application" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="daos" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="exceptions" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
</subPane>
</pane>
<pane id="Favorites" />
@@ -637,15 +793,15 @@
<property
name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth0"
value="124" />
<property
name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth3"
value="43" />
<property
name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth2"
value="137" />
- <property
name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder1"
value="1" />
<property name="options.splitter.main.proportions" value="0.3" />
+ <property
name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder1"
value="1" />
<property
name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder0"
value="0" />
<property
name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder3"
value="3" />
<property
name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder2"
value="2" />
- <property
name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth2"
value="113" />
<property name="recentsLimit" value="5" />
- <property
name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder4"
value="4" />
+ <property
name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth2"
value="113" />
<property
name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth1"
value="109" />
+ <property
name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder4"
value="4" />
<property
name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth0"
value="119" />
<property
name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth4"
value="732" />
<property name="GoToClass.includeJavaFiles" value="false" />
@@ -657,8 +813,8 @@
<property
name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder3"
value="3" />
<property
name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder4"
value="4" />
<property
name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder1"
value="1" />
- <property
name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder2"
value="2" />
<property name="DefaultHtmlFileTemplate" value="Html" />
+ <property
name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder2"
value="2" />
<property
name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder0"
value="0" />
<property name="options.searchVisible" value="true" />
</component>
@@ -700,13 +856,6 @@
<method>
<option name="PhingTarget" enabled="false" />
</method>
- </configuration>
- <configuration default="true" type="JavascriptDebugSession"
factoryName="Local">
- <JSDebuggerConfigurationSettings>
- <option name="engineId" value="embedded" />
- <option name="fileUrl" />
- </JSDebuggerConfigurationSettings>
- <method />
</configuration>
<configuration default="true" type="PhpUnitRemoteRunConfigurationType"
factoryName="PHPUnit on Server">
<method>
@@ -716,6 +865,13 @@
</option>
<option name="PhingTarget" enabled="false" />
</method>
+ </configuration>
+ <configuration default="true" type="JavascriptDebugSession"
factoryName="Local">
+ <JSDebuggerConfigurationSettings>
+ <option name="engineId" value="embedded" />
+ <option name="fileUrl" />
+ </JSDebuggerConfigurationSettings>
+ <method />
</configuration>
<list size="0" />
</component>
@@ -786,14 +942,14 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="-8" y="-8" width="1936" height="1066" extended-state="6" />
+ <frame x="-8" y="-8" width="1936" height="1066" extended-state="7" />
<editor active="false" />
<layout>
<window_info id="Data Sources" active="false" anchor="right"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.33" sideWeight="0.5" order="3" side_tool="false"
content_ui="tabs" />
<window_info id="Changes" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.31712964" sideWeight="0.5" order="7" side_tool="false"
content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.3298611" sideWeight="0.5" order="6" side_tool="false"
content_ui="tabs" />
- <window_info id="Structure" active="false" anchor="left"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true"
weight="0.21367522" sideWeight="0.6464758" order="1" side_tool="true"
content_ui="tabs" />
- <window_info id="Project" active="true" anchor="left"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true"
weight="0.21367522" sideWeight="0.34581497" order="0" side_tool="false"
content_ui="tabs" />
+ <window_info id="Structure" active="false" anchor="left"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true"
weight="0.21634616" sideWeight="0.39867842" order="1" side_tool="true"
content_ui="tabs" />
+ <window_info id="Project" active="true" anchor="left"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true"
weight="0.21634616" sideWeight="0.5936123" order="0" side_tool="false"
content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.1632653" sideWeight="0.5" order="3" side_tool="false"
content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs"
/>
<window_info id="Event Log" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs"
/>
@@ -847,7 +1003,7 @@
<option name="INCLUDE_TEXT_INTO_SHELF" value="false" />
<option name="CREATE_PATCH_EXPAND_DETAILS_DEFAULT" value="true" />
<option name="FORCE_NON_EMPTY_COMMENT" value="false" />
- <option name="LAST_COMMIT_MESSAGE" value="Dependency Injection set up
singleton" />
+ <option name="LAST_COMMIT_MESSAGE" value="CPanel Synonym Antonym
Relation" />
<option name="MAKE_NEW_CHANGELIST_ACTIVE" value="true" />
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
@@ -860,7 +1016,6 @@
<option name="UPDATE_GROUP_BY_CHANGELIST" value="false" />
<option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
<option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
- <MESSAGE value="Mock Ups " />
<MESSAGE value="Cpanel & mock ups " />
<MESSAGE value="Cpanel bug fix " />
<MESSAGE value="Cpanel " />
@@ -885,6 +1040,7 @@
<MESSAGE value="Refactoring zend framework" />
<MESSAGE value="CPanel. update types" />
<MESSAGE value="Dependency Injection set up singleton" />
+ <MESSAGE value="CPanel Synonym Antonym Relation" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager />
@@ -935,54 +1091,283 @@
<state line="95" column="42" selection-start="3382"
selection-end="3382" vertical-scroll-proportion="0.0" />
</provider>
</entry>
+ <entry
file="file://$PROJECT_DIR$/public/javascripts/cpanel/modules/entry/forms/Type.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="28" column="56" selection-start="1290"
selection-end="1290" vertical-scroll-proportion="0.0" />
+ </provider>
+ </entry>
+ <entry
file="file://$PROJECT_DIR$/application/providers/EntityManager.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="35" column="76" selection-start="1649"
selection-end="1649" vertical-scroll-proportion="0.0" />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/application/models/Entry.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="24" column="2" selection-start="1144"
selection-end="1144" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/build/solr/solrconfig.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="0" column="0" selection-start="0" selection-end="0"
vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/application/configs/Binder.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="51" column="86" selection-start="2130"
selection-end="2130" vertical-scroll-proportion="0.0" />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../phpsolr/Apache/Solr/Document.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="224" column="20" selection-start="6337"
selection-end="6337" vertical-scroll-proportion="1.8346546">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/application/models/Relation.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="132" column="16" selection-start="3770"
selection-end="3770" vertical-scroll-proportion="0.29445073">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/application/models/Misspelled.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="103" column="16" selection-start="3159"
selection-end="3159" vertical-scroll-proportion="0.29445073">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/application/models/Definition.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="227" column="16" selection-start="6442"
selection-end="6442" vertical-scroll-proportion="0.29445073">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/application/models/Clazz.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="138" column="15" selection-start="3748"
selection-end="3748" vertical-scroll-proportion="0.1596829">
+ <folding />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/application/models/Type.php">
<provider selected="true" editor-type-id="text-editor">
- <state line="173" column="15" selection-start="4498"
selection-end="4498" vertical-scroll-proportion="0.0" />
+ <state line="185" column="6" selection-start="4810"
selection-end="4810" vertical-scroll-proportion="0.4869762">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/application/models/Source.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="195" column="15" selection-start="4643"
selection-end="4643" vertical-scroll-proportion="2.2967157">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/tools/luceneindexing.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="114" column="16" selection-start="4384"
selection-end="5361" vertical-scroll-proportion="0.61608154">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/build/solr/schema.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="457" column="29" selection-start="25649"
selection-end="25657" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/build/solr/dataimport.properties">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="0" column="0" selection-start="0" selection-end="0"
vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/build/solr/data-config.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="86" column="0" selection-start="5034"
selection-end="5034" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry
file="file://$PROJECT_DIR$/public/javascripts/cpanel/modules/entry/grids/Relation.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="0" column="0" selection-start="0" selection-end="0"
vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry
file="file://$PROJECT_DIR$/application/modules/cpanel/controllers/PadananController.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="0" column="0" selection-start="0" selection-end="0"
vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/application/services/Search.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="159" column="7" selection-start="5406"
selection-end="5406" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry
file="file://$PROJECT_DIR$/application/modules/cpanel/controllers/EntriController.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="137" column="36" selection-start="4168"
selection-end="4168" vertical-scroll-proportion="-17.56">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/application/services/Entry.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="47" column="19" selection-start="1865"
selection-end="1967" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry
file="file://$PROJECT_DIR$/application/modules/cpanel/controllers/IndexController.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="0" column="0" selection-start="0" selection-end="0"
vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry
file="file://$PROJECT_DIR$/application/services/interfaces/CPanel.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="69" column="13" selection-start="2191"
selection-end="2191" vertical-scroll-proportion="0.33295584">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/application/daos/Search.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="274" column="5" selection-start="11741"
selection-end="11741" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/application/daos/Entry.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="283" column="8" selection-start="9240"
selection-end="9769" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/models/Meaning.php">
<provider selected="true" editor-type-id="text-editor">
- <state line="245" column="9" selection-start="6719"
selection-end="6719" vertical-scroll-proportion="0.0" />
+ <state line="37" column="6" selection-start="1596"
selection-end="1596" vertical-scroll-proportion="-0.41789356">
+ <folding />
+ </state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/public/javascripts/cpanel/modules/entry/forms/Type.js">
+ <entry file="file://$PROJECT_DIR$/application/models/Synonym.php">
<provider selected="true" editor-type-id="text-editor">
- <state line="28" column="56" selection-start="1290"
selection-end="1290" vertical-scroll-proportion="0.0">
+ <state line="147" column="0" selection-start="4107"
selection-end="4107" vertical-scroll-proportion="1.5651189">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/application/providers/EntityManager.php">
+ <entry
file="file://$PROJECT_DIR$/application/modules/cpanel/controllers/KamusController.php">
<provider selected="true" editor-type-id="text-editor">
- <state line="35" column="76" selection-start="1649"
selection-end="1649" vertical-scroll-proportion="0.0">
+ <state line="184" column="49" selection-start="5018"
selection-end="5018" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/application/configs/Binder.php">
+ <entry file="file://$PROJECT_DIR$/application/services/CPanel.php">
<provider selected="true" editor-type-id="text-editor">
- <state line="51" column="86" selection-start="2130"
selection-end="2130" vertical-scroll-proportion="0.0">
+ <state line="180" column="20" selection-start="5714"
selection-end="6597" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/application/daos/Meaning.php">
+ <entry
file="file://$PROJECT_DIR$/public/javascripts/cpanel/modules/entry/tree/Explorer.js">
<provider selected="true" editor-type-id="text-editor">
- <state line="43" column="38" selection-start="1989"
selection-end="1989" vertical-scroll-proportion="0.0">
+ <state line="0" column="0" selection-start="0" selection-end="0"
vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/application/daos/interfaces/Meaning.php">
+ <entry
file="file://$PROJECT_DIR$/public/javascripts/cpanel/stores/Meaning.js">
<provider selected="true" editor-type-id="text-editor">
- <state line="55" column="2" selection-start="1989"
selection-end="1989" vertical-scroll-proportion="0.0">
+ <state line="2" column="3" selection-start="72"
selection-end="391" vertical-scroll-proportion="0.0">
<folding />
</state>
+ </provider>
+ </entry>
+ <entry
file="file://$PROJECT_DIR$/public/javascripts/cpanel/modules/entry/panels/Equivalent.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="0" column="0" selection-start="0" selection-end="0"
vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry
file="file://$PROJECT_DIR$/public/javascripts/cpanel/modules/entry/panels/Relation.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="3" column="20" selection-start="126"
selection-end="126" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry
file="file://$PROJECT_DIR$/public/javascripts/cpanel/modules/entry/panels/Antonym.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="16" column="57" selection-start="706"
selection-end="706" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry
file="file://$PROJECT_DIR$/application/modules/cpanel/controllers/CariController.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="298" column="73" selection-start="11046"
selection-end="11046" vertical-scroll-proportion="-49.96">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry
file="file://$PROJECT_DIR$/application/services/interfaces/Meaning.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="34" column="10" selection-start="1569"
selection-end="1569" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/services/Meaning.php">
<provider selected="true" editor-type-id="text-editor">
- <state line="130" column="0" selection-start="3866"
selection-end="3866" vertical-scroll-proportion="0.38505095">
+ <state line="38" column="41" selection-start="1724"
selection-end="1724" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry
file="file://$PROJECT_DIR$/application/daos/interfaces/Meaning.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="70" column="24" selection-start="2397"
selection-end="2397" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/application/daos/Meaning.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="158" column="63" selection-start="5954"
selection-end="5954" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry
file="file://$PROJECT_DIR$/public/javascripts/cpanel/modules/entry/forms/MeaningComboBox.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="32" column="51" selection-start="1390"
selection-end="1390" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry
file="file://$PROJECT_DIR$/public/javascripts/cpanel/modules/entry/panels/Synonym.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="29" column="70" selection-start="1355"
selection-end="1355" vertical-scroll-proportion="0.5583239">
<folding />
</state>
</provider>
=======================================
--- /branches/kateglox/application/daos/Entry.php Tue Jan 24 14:42:53 2012
+++ /branches/kateglox/application/daos/Entry.php Thu Jan 26 09:11:22 2012
@@ -98,10 +98,11 @@
WHERE entry.entry = :entry");
$query->setParameter('entry', $entry);
/** @var $result \kateglo\application\models\Entry */
- $result = $query->getFirstResult();
- if (!($result instanceof models\Entry)) {
+ $result = $query->getResult();
+ if (!($result[0] instanceof models\Entry)) {
throw new DomainObjectNotFoundException ();
} else {
+ $result = $result[0];
if (is_int($version)) {
if ($result->getVersion() != $version) {
throw
OptimisticLockException::lockFailedVersionMissmatch(\kateglo\application\models\Entry::CLASS_NAME,
$version, $result->getVersion());
=======================================
--- /branches/kateglox/application/daos/Meaning.php Wed Jan 25 08:41:07 2012
+++ /branches/kateglox/application/daos/Meaning.php Thu Jan 26 09:11:22 2012
@@ -68,7 +68,7 @@
*
* @param int $id
* @param int $version
- * @return kateglo\application\models\Meaning
+ * @return \kateglo\application\models\Meaning
*/
public function getById($id, $version = null)
{
@@ -83,6 +83,93 @@
return $result;
}
+
+ /**
+ * @param int $meaningId
+ * @param array $entryIds
+ * @return \Doctrine\Common\Collections\ArrayCollection
+ */
+ public function getSynonymExclusives($meaningId, array $entryIds)
+ {
+ $meaning = $this->getById($meaningId);
+ $synonymIds = array();
+ /** @var $synonym \kateglo\application\models\Synonym */
+ foreach ($meaning->getSynonyms() as $synonym) {
+ $synonymIds[] = $synonym->getSynonym()->getId();
+ }
+ $dql = "SELECT meaning
+ FROM " . models\Meaning::CLASS_NAME . " meaning
+ LEFT JOIN meaning.entry entry
+ LEFT JOIN meaning.definitions definitions
+ WHERE entry.id IN (" . implode(', ', $entryIds) . ") ";
+ if (count($synonymIds) > 0) {
+ $dql .= " AND meaning.id NOT IN (" . implode(', ',
$synonymIds) . ") ";
+ }
+ $query = $this->entityManager->createQuery($dql);
+ $query->setFetchMode(models\Meaning::CLASS_NAME, "entry", "EAGER");
+
$query->setFetchMode(models\Meaning::CLASS_NAME, "definitions", "EAGER");
+ $result = $query->getResult();
+
+ return new ArrayCollection($result);
+ }
+
+ /**
+ * @param int $meaningId
+ * @param array $entryIds
+ * @return \Doctrine\Common\Collections\ArrayCollection
+ */
+ public function getAntonymExclusives($meaningId, array $entryIds)
+ {
+ $meaning = $this->getById($meaningId);
+ $antonymIds = array();
+ /** @var $antonym \kateglo\application\models\Antonym */
+ foreach ($meaning->getAntonyms() as $antonym) {
+ $antonymIds[] = $antonym->getAntonym()->getId();
+ }
+ $dql = "SELECT meaning
+ FROM " . models\Meaning::CLASS_NAME . " meaning
+ LEFT JOIN meaning.entry entry
+ LEFT JOIN meaning.definitions definitions
+ WHERE entry.id IN (" . implode(', ', $entryIds) . ") ";
+ if (count($antonymIds) > 0) {
+ $dql .= " AND meaning.id NOT IN (" . implode(', ',
$antonymIds) . ") ";
+ }
+ $query = $this->entityManager->createQuery($dql);
+ $query->setFetchMode(models\Meaning::CLASS_NAME, "entry", "EAGER");
+
$query->setFetchMode(models\Meaning::CLASS_NAME, "definitions", "EAGER");
+ $result = $query->getResult();
+
+ return new ArrayCollection($result);
+ }
+
+ /**
+ * @param int $meaningId
+ * @param array $entryIds
+ * @return \Doctrine\Common\Collections\ArrayCollection
+ */
+ public function getRelationExclusives($meaningId, array $entryIds)
+ {
+ $meaning = $this->getById($meaningId);
+ $relationIds = array();
+ /** @var $relation \kateglo\application\models\Relation */
+ foreach ($meaning->getRelations() as $relation) {
+ $relationIds[] = $synonym->getSynonym()->getId();
+ }
+ $dql = "SELECT meaning
+ FROM " . models\Meaning::CLASS_NAME . " meaning
+ LEFT JOIN meaning.entry entry
+ LEFT JOIN meaning.definitions definitions
+ WHERE entry.id IN (" . implode(', ', $entryIds) . ") ";
+ if (count($relationIds) > 0) {
+ $dql .= " AND meaning.id NOT IN (" . implode(', ',
$relationIds) . ") ";
+ }
+ $query = $this->entityManager->createQuery($dql);
+ $query->setFetchMode(models\Meaning::CLASS_NAME, "entry", "EAGER");
+
$query->setFetchMode(models\Meaning::CLASS_NAME, "definitions", "EAGER");
+ $result = $query->getResult();
+
+ return new ArrayCollection($result);
+ }
public function update(models\Meaning $meaning)
{
=======================================
--- /branches/kateglox/application/daos/Search.php Fri Dec 23 09:09:27 2011
+++ /branches/kateglox/application/daos/Search.php Thu Jan 26 09:11:22 2012
@@ -234,7 +234,7 @@
* @param \kateglo\application\models\front\Facet|null $facet
* @return \Doctrine\Common\Collections\ArrayCollection
*/
- function source($searchText, front\Pagination $pagination, front\Facet
$facet = null)
+ public function source($searchText, front\Pagination $pagination,
front\Facet $facet = null)
{
$params = $this->getDefaultParams($searchText);
$params = $facet == null ? $params :
$this->getFilterQuery($params, $facet);
@@ -257,7 +257,7 @@
* @param \kateglo\application\models\front\Facet|null $facet
* @return \Doctrine\Common\Collections\ArrayCollection
*/
- function foreign($searchText, front\Pagination $pagination,
front\Facet $facet = null)
+ public function foreign($searchText, front\Pagination $pagination,
front\Facet $facet = null)
{
$params = $this->getDefaultParams($searchText);
$params = $facet == null ? $params :
$this->getFilterQuery($params, $facet);
@@ -317,7 +317,7 @@
public function update(models\Entry $entry)
{
$docs = $this->searchDocumentById($entry->getId());
- $docs->setField('entri', $entry->getEntry());
+ $this->setFields($docs, $entry);
$this->solr->addDocument($docs);
$this->solr->commit();
}
@@ -329,7 +329,6 @@
public function insert(models\Entry $entry)
{
$docs = new \Apache_Solr_Document();
- $docs->setField('entri', $entry->getEntry());
$docs->setField('id', $entry->getId());
$this->solr->addDocument($docs);
$this->solr->commit();
@@ -344,6 +343,105 @@
$this->solr->deleteById($id);
$this->solr->commit();
}
+
+ /**
+ * @param \Apache_Solr_Document $docs
+ * @param \kateglo\application\models\Entry $entry
+ */
+ private function setFields(\Apache_Solr_Document $docs, models\Entry
$entry)
+ {
+ $docs->setField('entri', $entry->getEntry());
+ /** @var $meaning \kateglo\application\models\Meaning */
+ foreach ($entry->getMeanings() as $meaning) {
+ /** @var $antonym \kateglo\application\models\Antonym */
+ foreach ($meaning->getAntonyms() as $antonym) {
+ $docs->addField('antonim',
$antonym->getAntonym()->getEntry()->getEntry());
+ }
+
+ /** @var $definition \kateglo\application\models\Definition */
+ foreach ($meaning->getDefinitions() as $definition) {
+ $docs->addField('definisi', $definition->getDefinition());
+
+ if ($definition->getClazz() instanceof models\Clazz) {
+ $docs->addField('kelas',
$definition->getClazz()->getClazz());
+
+ if ($definition->getClazz()->getCategory() instanceof
models\ClazzCategory) {
+ $docs->addField('kategoriKelas',
$definition->getClazz()->getCategory()->getCategory());
+ }
+ }
+
+ /** @var $discipline
\kateglo\application\models\Discipline */
+ foreach ($definition->getDisciplines() as $discipline) {
+ $docs->addField('disiplin',
$discipline->getDiscipline());
+ }
+
+ /** @var $sample \kateglo\application\models\Sample */
+ foreach ($definition->getSamples() as $sample) {
+ $docs->addField('contoh', $sample->getSample());
+ }
+
+ }
+
+ /** @var $misspelled \kateglo\application\models\Misspelled */
+ foreach ($meaning->getMisspelleds() as $misspelled) {
+ $docs->addField('salahEja',
$misspelled->getMisspelled()->getEntry()->getEntry());
+ }
+
+ /** @var $relation \kateglo\application\models\Relation */
+ foreach ($meaning->getRelations() as $relation) {
+ $docs->addField('relasi',
$relation->getRelation()->getEntry()->getEntry());
+ }
+
+ /** @var $synonym \kateglo\application\models\Synonym */
+ foreach ($meaning->getSynonyms() as $synonym) {
+ $docs->addField('sinonim',
$synonym->getSynonym()->getEntry()->getEntry());
+ }
+
+ if ($meaning->getSpelled() instanceof models\Misspelled) {
+ $docs->setField('ejaan',
$meaning->getSpelled()->getMeaning()->getEntry()->getEntry());
+ }
+
+ /** @var $syllabel \kateglo\application\models\Syllabel */
+ foreach ($meaning->getSyllabels() as $syllabel) {
+ $docs->addField('silabel', $syllabel->getSyllabel());
+ }
+
+ /** @var $type \kateglo\application\models\Type */
+ foreach ($meaning->getTypes() as $type) {
+ $docs->addField('bentuk', $type->getType());
+
+ if ($type->getCategory() instanceof models\TypeCategory) {
+ $docs->addField('kategoriBentuk',
$type->getCategory()->getCategory());
+ }
+ }
+
+ /** @var $source \kateglo\application\models\Source */
+ foreach ($entry->getSources() as $source) {
+ $docs->addField('sumber',
strip_tags(html_entity_decode($source->getSource(), ENT_QUOTES, 'UTF-8')));
+
+ $docs->addField('kategoriSumber',
$source->getCategory()->getCategory());
+ }
+
+ /** @var $equivalent \kateglo\application\models\Equivalent */
+ foreach ($entry->getEquivalents() as $equivalent) {
+ $docs->addField('asing',
$equivalent->getForeign()->getForeign());
+ $equivalentData['foreign'] =
$equivalent->getForeign()->getForeign();
+
+ $docs->addField('bahasa',
$equivalent->getForeign()->getLanguage()->getLanguage());
+ $equivalentData['language'] =
$equivalent->getForeign()->getLanguage()->getLanguage();
+
+ $disciplineData = array();
+ /** @var $disciplineEq
\kateglo\application\models\Discipline */
+ foreach ($equivalent->getDisciplines() as $disciplineEq) {
+ $docs->addField('disiplinPadanan',
$disciplineEq->getDiscipline());
+ $disciplineData[] = $disciplineEq->getDiscipline();
+ }
+ $equivalentData['discipline'] = $disciplineData;
+
+ $docs->addField('padanan', json_encode($equivalentData));
+ }
+ }
+ }
/**
* @param array $params
=======================================
--- /branches/kateglox/application/daos/interfaces/Meaning.php Wed Jan 25
08:41:07 2012
+++ /branches/kateglox/application/daos/interfaces/Meaning.php Thu Jan 26
09:11:22 2012
@@ -45,6 +45,31 @@
*/
function getById($id, $version = null);
+
+ /**
+ * @abstract
+ * @param int $meaningId
+ * @param array $entryIds
+ * @return \Doctrine\Common\Collections\ArrayCollection
+ */
+ function getSynonymExclusives($meaningId, array $entryIds);
+
+ /**
+ * @abstract
+ * @param int $meaningId
+ * @param array $entryIds
+ * @return \Doctrine\Common\Collections\ArrayCollection
+ */
+ function getAntonymExclusives($meaningId, array $entryIds);
+
+ /**
+ * @abstract
+ * @param int $meaningId
+ * @param array $entryIds
+ * @return \Doctrine\Common\Collections\ArrayCollection
+ */
+ function getRelationExclusives($meaningId, array $entryIds);
+
/**
* @abstract
* @param \kateglo\application\models\Meaning $meaning
=======================================
--- /branches/kateglox/application/models/Clazz.php Tue Nov 15 09:01:16 2011
+++ /branches/kateglox/application/models/Clazz.php Thu Jan 26 09:11:22 2012
@@ -20,6 +20,7 @@
* <http://code.google.com/p/kateglo/>.
*/
use Doctrine\Common\Collections\ArrayCollection;
+
/**
*
*
@@ -34,171 +35,185 @@
* @Entity
* @Table(name="class")
*/
-class Clazz {
-
- const CLASS_NAME = __CLASS__;
-
- /**
- * @var int
- * @Id
- * @Column(type="integer", name="class_id")
- * @GeneratedValue(strategy="AUTO")
- */
- private $id;
-
- /**
- *
- * Enter description here ...
- * @var int
- * @Version
- * @Column(type="integer", name="class_version")
- */
- private $version;
-
- /**
- *
- * @var string
- * @Column(type="string", name="class_name", unique=true, length=255)
- */
- private $clazz;
-
- /**
- * @var Doctrine\Common\Collections\ArrayCollection
- * @ManyToMany(targetEntity="kateglo\application\models\Definition")
- * @JoinTable(name="rel_definition_class",
- * joinColumns={@JoinColumn(name="rel_class_id",
referencedColumnName="class_id")},
- * inverseJoinColumns={@JoinColumn(name="rel_definition_id",
referencedColumnName="definition_id")}
- * )
- */
- private $definitions;
-
- /**
- * @var Doctrine\Common\Collections\ArrayCollection
- * @ManyToMany(targetEntity="kateglo\application\models\ClazzCategory")
- * @JoinTable(name="rel_class_category",
- * joinColumns={@JoinColumn(name="rel_class_id",
referencedColumnName="class_id")},
- * inverseJoinColumns={@JoinColumn(name="rel_class_category_id",
referencedColumnName="class_category_id")}
- * )
- */
- private $categories;
-
- public function __construct() {
- $this->definitions = new ArrayCollection();
- $this->categories = new ArrayCollection ();
- }
-
- /**
- *
- * @return int
- */
- public function getId() {
- return $this->id;
- }
-
- /**
- * @return the $version
- */
- public function getVersion() {
- return $this->version;
- }
-
- /**
- * @param int $version
- */
- public function setVersion($version) {
- $this->version = $version;
- }
-
- /**
- *
- * @param string $clazz
- * @return void
- */
- public function setClazz($clazz) {
- $this->clazz = $clazz;
- }
-
- /**
- *
- * @return string
- */
- public function getClazz() {
- return $this->clazz;
- }
-
- /**
- *
- * @param kateglo\application\models\Definition $definition
- * @return void
- */
- public function addDefinition(Definition $definition) {
- if (! $this->definitions->contains ( $definition )) {
- $this->definitions [] = $definition;
- $definition->setClazz ( $this );
- }
- }
-
- /**
- *
- * @param kateglo\application\models\Definition $definition
- * @return void
- */
- public function removeDefinition(Definition $definition) {
- /*@var $removed kateglo\application\models\Definition */
- $removed = $this->definitions->removeElement ( $definition );
- if ($removed !== null) {
- $removed->removeClazz();
- }
- }
-
- /**
- *
- * @return Doctrine\Common\Collections\ArrayCollection
- */
- public function getDefinitions() {
- return $this->definitions;
- }
-
- /**
- *
- * @param kateglo\application\models\ClazzCategory $category
- * @return void
- */
- public function setCategory(ClazzCategory $category) {
- if (! $this->categories->contains ( $category )) {
- $this->categories [0] = $category;
- $category->addClazz ( $this );
- }
- }
-
- /**
- *
- * @param kateglo\application\models\ClazzCategory $category
- * @return void
- */
- public function removeCategory(ClazzCategory $category) {
- $removed = $this->categories->removeElement ( $category );
- if ($removed !== null) {
- $removed->removeType ();
- }
- }
-
- /**
- *
- * @return kateglo\application\models\ClazzCategory
- */
- public function getCategory() {
- return $this->categories->get(0);
- }
+class Clazz
+{
+
+ const CLASS_NAME = __CLASS__;
+
+ /**
+ * @var int
+ * @Id
+ * @Column(type="integer", name="class_id")
+ * @GeneratedValue(strategy="AUTO")
+ */
+ private $id;
+
+ /**
+ *
+ * Enter description here ...
+ * @var int
+ * @Version
+ * @Column(type="integer", name="class_version")
+ */
+ private $version;
+
+ /**
+ *
+ * @var string
+ * @Column(type="string", name="class_name", unique=true, length=255)
+ */
+ private $clazz;
+
+ /**
+ * @var Doctrine\Common\Collections\ArrayCollection
+ * @ManyToMany(targetEntity="kateglo\application\models\Definition")
+ * @JoinTable(name="rel_definition_class",
+ * joinColumns={@JoinColumn(name="rel_class_id",
referencedColumnName="class_id")},
+ * inverseJoinColumns={@JoinColumn(name="rel_definition_id",
referencedColumnName="definition_id")}
+ * )
+ */
+ private $definitions;
+
+ /**
+ * @var Doctrine\Common\Collections\ArrayCollection
+ * @ManyToMany(targetEntity="kateglo\application\models\ClazzCategory")
+ * @JoinTable(name="rel_class_category",
+ * joinColumns={@JoinColumn(name="rel_class_id",
referencedColumnName="class_id")},
+ * inverseJoinColumns={@JoinColumn(name="rel_class_category_id",
referencedColumnName="class_category_id")}
+ * )
+ */
+ private $categories;
+
+ public function __construct()
+ {
+ $this->definitions = new ArrayCollection();
+ $this->categories = new ArrayCollection ();
+ }
+
+ /**
+ *
+ * @return int
+ */
+ public function getId()
+ {
+ return $this->id;
+ }
+
+ /**
+ * @return the $version
+ */
+ public function getVersion()
+ {
+ return $this->version;
+ }
+
+ /**
+ * @param int $version
+ */
+ public function setVersion($version)
+ {
+ $this->version = $version;
+ }
+
+ /**
+ *
+ * @param string $clazz
+ * @return void
+ */
+ public function setClazz($clazz)
+ {
+ $this->clazz = $clazz;
+ }
+
+ /**
+ *
+ * @return string
+ */
+ public function getClazz()
+ {
+ return $this->clazz;
+ }
+
+ /**
+ *
+ * @param \kateglo\application\models\Definition $definition
+ * @return void
+ */
+ public function addDefinition(Definition $definition)
+ {
+ if (!$this->definitions->contains($definition)) {
+ $this->definitions [] = $definition;
+ $definition->setClazz($this);
+ }
+ }
+
+ /**
+ *
+ * @param \kateglo\application\models\Definition $definition
+ * @return void
+ */
+ public function removeDefinition(Definition $definition)
+ {
+ /*@var $removed kateglo\application\models\Definition */
+ $removed = $this->definitions->removeElement($definition);
+ if ($removed !== null) {
+ $removed->removeClazz();
+ }
+ }
+
+ /**
+ *
+ * @return Doctrine\Common\Collections\ArrayCollection
+ */
+ public function getDefinitions()
+ {
+ return $this->definitions;
+ }
+
+ /**
+ *
+ * @param \kateglo\application\models\ClazzCategory $category
+ * @return void
+ */
+ public function setCategory(ClazzCategory $category)
+ {
+ if (!$this->categories->contains($category)) {
+ $this->categories [0] = $category;
+ $category->addClazz($this);
+ }
+ }
+
+ /**
+ *
+ * @param \kateglo\application\models\ClazzCategory $category
+ * @return void
+ */
+ public function removeCategory(ClazzCategory $category)
+ {
+ $removed = $this->categories->removeElement($category);
+ if ($removed !== null) {
+ $removed->removeType();
+ }
+ }
+
+ /**
+ *
+ * @return \kateglo\application\models\ClazzCategory
+ */
+ public function getCategory()
+ {
+ return $this->categories->get(0);
+ }
/**
* @return array
*/
- public function toArray(){
+ public function toArray()
+ {
$array['id'] = $this->id;
$array['version'] = $this->version;
$array['class'] = $this->clazz;
- $array['category'] = ($this->getCategory() instanceof
ClazzCategory) ? $this->getCategory()->toArray() : null;
+ $array['category'] = ($this->getCategory() instanceof
ClazzCategory) ? $this->getCategory()->toArray() : null;
return $array;
}
=======================================
--- /branches/kateglox/application/models/Definition.php Tue Nov 15
09:01:16 2011
+++ /branches/kateglox/application/models/Definition.php Thu Jan 26
09:11:22 2012
@@ -225,7 +225,7 @@
/**
*
- * @return kateglo\application\models\Clazz
+ * @return \kateglo\application\models\Clazz
*/
public function getClazz() {
return $this->clazz->get ( 0 );
=======================================
--- /branches/kateglox/application/models/Meaning.php Tue Jan 24 10:14:47
2012
+++ /branches/kateglox/application/models/Meaning.php Thu Jan 26 09:11:22
2012
@@ -437,7 +437,7 @@
/**
*
- * @return kateglo\application\models\Misspelled
+ * @return \kateglo\application\models\Misspelled
*/
public function getSpelled()
{
=======================================
--- /branches/kateglox/application/models/Misspelled.php Tue Nov 15
09:01:16 2011
+++ /branches/kateglox/application/models/Misspelled.php Thu Jan 26
09:11:22 2012
@@ -101,7 +101,7 @@
}
/**
- * @return kateglo\application\models\Meaning
+ * @return \kateglo\application\models\Meaning
*/
public function getMeaning() {
return $this->meaning;
@@ -130,7 +130,7 @@
/**
*
- * @return kateglo\application\models\Meaning
+ * @return \kateglo\application\models\Meaning
*/
public function getMisspelled() {
return $this->misspelled;
=======================================
--- /branches/kateglox/application/models/Relation.php Tue Nov 15 09:01:16
2011
+++ /branches/kateglox/application/models/Relation.php Thu Jan 26 09:11:22
2012
@@ -130,7 +130,7 @@
/**
*
- * @return kateglo\application\models\Meaning
+ * @return \kateglo\application\models\Meaning
*/
public function getRelation() {
return $this->relation;
=======================================
--- /branches/kateglox/application/models/Source.php Fri Dec 23 09:09:27
2011
+++ /branches/kateglox/application/models/Source.php Thu Jan 26 09:11:22
2012
@@ -158,14 +158,14 @@
}
/**
- * @return kateglo\application\models\SourceCategory
+ * @return \kateglo\application\models\SourceCategory
*/
public function getCategory() {
return $this->category;
}
/**
- * @param kateglo\application\models\SourceCategory $category
+ * @param \kateglo\application\models\SourceCategory $category
* @return void
*/
public function setCategory(SourceCategory $category) {
@@ -186,14 +186,14 @@
}
/**
- * @return kateglo\application\models\Entry
+ * @return \kateglo\application\models\Entry
*/
public function getEntry() {
return $this->entry;
}
/**
- * @param kateglo\application\models\Entry $entry
+ * @param \kateglo\application\models\Entry $entry
* @return void
*/
public function setEntry(Entry $entry) {
=======================================
--- /branches/kateglox/application/models/Synonym.php Tue Nov 15 09:01:16
2011
+++ /branches/kateglox/application/models/Synonym.php Thu Jan 26 09:11:22
2012
@@ -121,7 +121,7 @@
*/
public function removeMeaning() {
if ($this->meaning !== null) {
- /*@var $entry kateglo\application\models\Meaning */
+ /** @var $meaning \kateglo\application\models\Meaning */
$meaning = $this->meaning;
$this->meaning = null;
$meaning->removeSynonym($this);
@@ -130,7 +130,7 @@
/**
*
- * @return kateglo\application\models\Meaning
+ * @return \kateglo\application\models\Meaning
*/
public function getSynonym() {
return $this->synonym;
=======================================
--- /branches/kateglox/application/models/Type.php Tue Jan 24 10:14:47 2012
+++ /branches/kateglox/application/models/Type.php Thu Jan 26 09:11:22 2012
@@ -184,7 +184,6 @@
/**
*
- * @param kateglo\application\models\TypeCategory $category
* @return void
*/
public function removeCategory()
@@ -197,7 +196,7 @@
/**
*
- * @return kateglo\application\models\TypeCategory
+ * @return \kateglo\application\models\TypeCategory
*/
public function getCategory()
{
=======================================
---
/branches/kateglox/application/modules/cpanel/controllers/CariController.php
Tue Jan 24 10:14:47 2012
+++
/branches/kateglox/application/modules/cpanel/controllers/CariController.php
Thu Jan 26 09:11:22 2012
@@ -19,6 +19,7 @@
* <http://code.google.com/p/kateglo/>.
*/
use kateglo\application\services\interfaces;
+use \Doctrine\Common\Collections\ArrayCollection;
use kateglo\application\models;
/**
@@ -45,7 +46,14 @@
/**
*
* Enter description here ...
- * @param \kateglo\application\faces\interfaces\Search $entry
+ * @var \kateglo\application\services\interfaces\Meaning;
+ */
+ private $meaning;
+
+ /**
+ *
+ * Enter description here ...
+ * @param \kateglo\application\services\interfaces\Search $search
*
* @Inject
*/
@@ -53,6 +61,18 @@
{
$this->search = $search;
}
+
+ /**
+ *
+ * Enter description here ...
+ * @param \kateglo\application\services\interfaces\Meaning $meaning
+ *
+ * @Inject
+ */
+ public function setMeaning(interfaces\Meaning $meaning)
+ {
+ $this->meaning = $meaning;
+ }
/**
* (non-PHPdoc)
@@ -81,7 +101,6 @@
? intval($this->_request->getParam('start'))
: 0));
try {
- $cacheId = __METHOD__ . '\\' . $searchText . '\\' .
$pagination->getOffset() . '\\' . $pagination->getLimit();
$hits = $this->search->entry($searchText, $pagination);
$result = array();
$documents = $hits->getDocuments();
@@ -93,7 +112,6 @@
$result[] = $array;
}
$this->content = array('total' => $hits->getCount(), 'hits' =>
$result);
- $this->responseBuilder($cacheId);
} catch (Apache_Solr_Exception $e) {
$this->getResponse()->setHttpResponseCode(400);
$this->content = array('error' => 'query error');
@@ -109,33 +127,31 @@
*/
public function sumber()
{
- $search = new models\front\Search();
- $pagination = new models\front\Pagination();
- $searchText =
urldecode($this->getRequest()->getParam($search->getFieldName()));
-
$pagination->setLimit((is_numeric($this->_request->getParam('limit'))
- ? intval($this->_request->getParam('limit'))
- : 10));
-
$pagination->setOffset((is_numeric($this->_request->getParam('start'))
- ? intval($this->_request->getParam('start'))
- : 0));
- try {
- $cacheId = __METHOD__ . '\\' . $searchText . '\\' .
$pagination->getOffset() . '\\' . $pagination->getLimit();
- $sources = $this->search->source($searchText, $pagination);
- $result = array();
- /** @var $source \kateglo\application\models\Source */
- foreach ($sources as $source) {
- $array = array();
- $array['id'] = $source->getId();
- $array['entry'] = $source->getClean();
- $result[] = $array;
- }
- $this->content = array('total' => count($sources), 'hits'
=> $result);
- $this->responseBuilder($cacheId);
- } catch (Apache_Solr_Exception $e) {
- $this->getResponse()->setHttpResponseCode(400);
- $this->content = array('error' => 'query error');
- }
- $this->_helper->json($this->content);
+ $search = new models\front\Search();
+ $pagination = new models\front\Pagination();
+ $searchText =
urldecode($this->getRequest()->getParam($search->getFieldName()));
+
$pagination->setLimit((is_numeric($this->_request->getParam('limit'))
+ ? intval($this->_request->getParam('limit'))
+ : 10));
+
$pagination->setOffset((is_numeric($this->_request->getParam('start'))
+ ? intval($this->_request->getParam('start'))
+ : 0));
+ try {
+ $sources = $this->search->source($searchText, $pagination);
+ $result = array();
+ /** @var $source \kateglo\application\models\Source */
+ foreach ($sources as $source) {
+ $array = array();
+ $array['id'] = $source->getId();
+ $array['entry'] = $source->getClean();
+ $result[] = $array;
+ }
+ $this->content = array('total' => count($sources), 'hits' =>
$result);
+ } catch (Apache_Solr_Exception $e) {
+ $this->getResponse()->setHttpResponseCode(400);
+ $this->content = array('error' => 'query error');
+ }
+ $this->_helper->json($this->content);
}
/**
@@ -156,7 +172,6 @@
? intval($this->_request->getParam('start'))
: 0));
try {
- $cacheId = __METHOD__ . '\\' . $searchText . '\\' .
$pagination->getOffset() . '\\' . $pagination->getLimit();
$foreigns = $this->search->foreign($searchText, $pagination);
$result = array();
/** @var $foreign \kateglo\application\models\Foreign */
@@ -167,7 +182,6 @@
$result[] = $array;
}
$this->content = array('total' => count($foreigns), 'hits' =>
$result);
- $this->responseBuilder($cacheId);
} catch (Apache_Solr_Exception $e) {
$this->getResponse()->setHttpResponseCode(400);
$this->content = array('error' => 'query error');
@@ -176,28 +190,146 @@
}
/**
+ * @var int $id
* @return void
* @Get
- * @Path('/arti')
+ * @Path('/sinonim/{meaningId}')
+ * @PathParam{meaningId}(meaningId)
* @Produces('application/json')
*/
- public function artiJson()
- {
- $searchText =
$this->getRequest()->getParam($this->view->search->getFieldName());
+ public function synonym($meaningId)
+ {
+ $search = new models\front\Search();
+ $pagination = new models\front\Pagination();
+ $searchText =
urldecode($this->getRequest()->getParam($search->getFieldName()));
+
$pagination->setLimit((is_numeric($this->_request->getParam('limit'))
+ ? intval($this->_request->getParam('limit'))
+ : 10));
+
$pagination->setOffset((is_numeric($this->_request->getParam('start'))
+ ? intval($this->_request->getParam('start'))
+ : 0));
try {
- $cacheId = __METHOD__ . '\\' . $searchText;
- if (!$this->evaluatePreCondition($cacheId)) {
- /*@var $hits array */
- $hits = $this->cpanel->searchMeaningAsJSON($searchText,
$this->offset, $this->limit);
- $this->content = $hits;
- }
- $this->responseBuilder($cacheId);
+ $hits = $this->search->entry($searchText, $pagination);
+ $result = array();
+ $entryIds = array();
+ $documents = $hits->getDocuments();
+ /** @var $document \kateglo\application\models\solr\Document */
+ foreach ($documents as $document) {
+ $entryIds[] = $document->getId();
+ }
+ if (count($entryIds) > 0) {
+ $result =
$this->createResult($this->meaning->getSynonymExclusives($meaningId,
$entryIds));
+ }
+ $this->content = $result;
} catch (Apache_Solr_Exception $e) {
$this->getResponse()->setHttpResponseCode(400);
$this->content = array('error' => 'query error');
}
$this->_helper->json($this->content);
}
+
+ /**
+ * @var int $id
+ * @return void
+ * @Get
+ * @Path('/antonim/{meaningId}')
+ * @PathParam{meaningId}(meaningId)
+ * @Produces('application/json')
+ */
+ public function antonym($meaningId)
+ {
+ $search = new models\front\Search();
+ $pagination = new models\front\Pagination();
+ $searchText =
urldecode($this->getRequest()->getParam($search->getFieldName()));
+
$pagination->setLimit((is_numeric($this->_request->getParam('limit'))
+ ? intval($this->_request->getParam('limit'))
+ : 10));
+
$pagination->setOffset((is_numeric($this->_request->getParam('start'))
+ ? intval($this->_request->getParam('start'))
+ : 0));
+ try {
+ $hits = $this->search->entry($searchText, $pagination);
+ $result = array();
+ $entryIds = array();
+ $documents = $hits->getDocuments();
+ /** @var $document \kateglo\application\models\solr\Document */
+ foreach ($documents as $document) {
+ $entryIds[] = $document->getId();
+ }
+ if (count($entryIds) > 0) {
+ $result =
$this->createResult($this->meaning->getAntonymExclusives($meaningId,
$entryIds));
+ }
+ $this->content = $result;
+ } catch (Apache_Solr_Exception $e) {
+ $this->getResponse()->setHttpResponseCode(400);
+ $this->content = array('error' => 'query error');
+ }
+ $this->_helper->json($this->content);
+ }
+
+ /**
+ * @var int $id
+ * @return void
+ * @Get
+ * @Path('/relasi/{meaningId}')
+ * @PathParam{meaningId}(meaningId)
+ * @Produces('application/json')
+ */
+ public function relation($meaningId)
+ {
+ $search = new models\front\Search();
+ $pagination = new models\front\Pagination();
+ $searchText =
urldecode($this->getRequest()->getParam($search->getFieldName()));
+
$pagination->setLimit((is_numeric($this->_request->getParam('limit'))
+ ? intval($this->_request->getParam('limit'))
+ : 10));
+
$pagination->setOffset((is_numeric($this->_request->getParam('start'))
+ ? intval($this->_request->getParam('start'))
+ : 0));
+ try {
+ $hits = $this->search->entry($searchText, $pagination);
+ $result = array();
+ $entryIds = array();
+ $documents = $hits->getDocuments();
+ /** @var $document \kateglo\application\models\solr\Document */
+ foreach ($documents as $document) {
+ $entryIds[] = $document->getId();
+ }
+ if (count($entryIds) > 0) {
+ $result =
$this->createResult($this->meaning->getRelationExclusives($meaningId,
$entryIds));
+ }
+ $this->content = $result;
+ } catch (Apache_Solr_Exception $e) {
+ $this->getResponse()->setHttpResponseCode(400);
+ $this->content = array('error' => 'query error');
+ }
+ $this->_helper->json($this->content);
+ }
+
+ /**
+ * @param \Doctrine\Common\Collections\ArrayCollection $meanings
+ * @return array
+ */
+ private function createResult(ArrayCollection $meanings)
+ {
+ $result = array();
+ /** @var $meaning \kateglo\application\models\Meaning */
+ foreach ($meanings as $meaning) {
+ $array = array();
+ $array['id'] = $meaning->getId();
+ $array['entryId'] = $meaning->getEntry()->getId();
+ $array['entry'] = $meaning->getEntry()->getEntry();
+ $definitions = $meaning->getDefinitions();
+ $array['definition'] = $definitions->first()->getDefinition();
+ $array['definitions'] = array();
+ /** @var $definition \kateglo\application\models\Definition */
+ foreach ($definitions as $definition) {
+ $array['definitions'][] = $definition->getDefinition();
+ }
+ $result[] = $array;
+ }
+ return $result;
+ }
}
?>
=======================================
---
/branches/kateglox/application/modules/cpanel/controllers/EntriController.php
Tue Jan 24 10:14:47 2012
+++
/branches/kateglox/application/modules/cpanel/controllers/EntriController.php
Thu Jan 26 09:11:22 2012
@@ -94,17 +94,12 @@
*/
public function getById($id)
{
- $cacheId = __METHOD__ . '\\' . $id;
- if (!$this->evaluatePreCondition($cacheId)) {
- try {
- $entry = $this->entry->getEntryById($id);
- $this->content = $entry->toArray();
- } catch (DomainResultEmptyException $e) {
- throw new HTTPNotFoundException('Entry Not Found.');
- }
- }
-
- $this->responseBuilder($cacheId);
+ try {
+ $entry = $this->entry->getEntryById($id);
+ $this->content = $entry->toArray();
+ } catch (DomainResultEmptyException $e) {
+ throw new HTTPNotFoundException('Entry Not Found.');
+ }
$this->_helper->json($this->content);
}
=======================================
--- /branches/kateglox/application/services/Meaning.php Wed Jan 25 08:41:07
2012
+++ /branches/kateglox/application/services/Meaning.php Thu Jan 26 09:11:22
2012
@@ -113,6 +113,36 @@
$result = $this->entry->getById($id, $version);
return $result;
}
+
+ /**
+ * @param int $meaningId
+ * @param array $entryIds
+ * @return \Doctrine\Common\Collections\ArrayCollection
+ */
+ public function getSynonymExclusives($meaningId, array $entryIds)
+ {
+ return $this->meaning->getSynonymExclusives($meaningId, $entryIds);
+ }
+
+ /**
+ * @param int $meaningId
+ * @param array $entryIds
+ * @return \Doctrine\Common\Collections\ArrayCollection
+ */
+ public function getAntonymExclusives($meaningId, array $entryIds)
+ {
+ return $this->meaning->getAntonymExclusives($meaningId, $entryIds);
+ }
+
+ /**
+ * @param int $meaningId
+ * @param array $entryIds
+ * @return \Doctrine\Common\Collections\ArrayCollection
+ */
+ public function getRelationExclusives($meaningId, array $entryIds)
+ {
+ return $this->meaning->getRelationExclusives($meaningId,
$entryIds);
+ }
/**
* @param $id
=======================================
--- /branches/kateglox/application/services/interfaces/Meaning.php Tue Jan
24 10:14:47 2012
+++ /branches/kateglox/application/services/interfaces/Meaning.php Thu Jan
26 09:11:22 2012
@@ -39,7 +39,7 @@
/**
* @abstract
- * @param $id
+ * @param int $id
* @param null $version
* @return \kateglo\application\models\Meaning
*/
@@ -47,8 +47,32 @@
/**
* @abstract
- * @param $meaningId
- * @param $meaningVersion
+ * @param int $meaningId
+ * @param array $entryIds
+ * @return \Doctrine\Common\Collections\ArrayCollection
+ */
+ function getSynonymExclusives($meaningId, array $entryIds);
+
+ /**
+ * @abstract
+ * @param int $meaningId
+ * @param array $entryIds
+ * @return \Doctrine\Common\Collections\ArrayCollection
+ */
+ function getAntonymExclusives($meaningId, array $entryIds);
+
+ /**
+ * @abstract
+ * @param int $meaningId
+ * @param array $entryIds
+ * @return \Doctrine\Common\Collections\ArrayCollection
+ */
+ function getRelationExclusives($meaningId, array $entryIds);
+
+ /**
+ * @abstract
+ * @param int $meaningId
+ * @param int $meaningVersion
* @param array $types
*/
function updateTypes($meaningId, $meaningVersion, array $types);
=======================================
---
/branches/kateglox/public/javascripts/cpanel/modules/entry/forms/MeaningComboBox.js
Tue Nov 15 09:01:16 2011
+++
/branches/kateglox/public/javascripts/cpanel/modules/entry/forms/MeaningComboBox.js
Thu Jan 26 09:11:22 2012
@@ -16,7 +16,7 @@
anchor: '100%',
hideTrigger: true,
forceSelection: true,
- store: new kateglo.stores.Meaning(),
+ store: this.store,
emptyText: 'Ketik yang dicari, pilih salah satu dari
hasil yang ditampilkan, kemudian tekan enter',
listConfig: {
getInnerTpl: function() {
@@ -30,13 +30,7 @@
},
listeners:{
scope: this,
- select: function(field, value) {
- var store =
field.up().up().getComponent(1).getStore();
- if (store.getById(value[0].getId()) == null) {
- store.add(value[0]);
- }
- field.selectText(0, field.value.length);
- }
+ select: this.selectCallback
}
})
]
=======================================
---
/branches/kateglox/public/javascripts/cpanel/modules/entry/panels/Antonym.js
Tue Nov 15 09:01:16 2011
+++
/branches/kateglox/public/javascripts/cpanel/modules/entry/panels/Antonym.js
Thu Jan 26 09:11:22 2012
@@ -1,24 +1,30 @@
Ext.define('kateglo.modules.entry.panels.Antonym', {
- extend: 'Ext.panel.Panel',
- title: 'Antonym',
- layout: 'border',
- tbar: [
- {
- text: 'Save',
- iconCls: 'cpanel_sprite cpanel_disk'
- },
- '->',
- {
- text: 'Reset',
- iconCls: 'cpanel_sprite cpanel_arrow_undo'
- }
- ],
- initComponent: function() {
+ extend:'Ext.panel.Panel',
+ title:'Antonym',
+ layout:'border',
+ initComponent:function () {
Ext.apply(this, {
- items: [
- new kateglo.modules.entry.forms.MeaningComboBox(),
+ items:[
+ new kateglo.modules.entry.forms.MeaningComboBox({
+ store:new Ext.data.Store({
+ model:'kateglo.models.Meaning',
+ pageSize:10000000,
+ proxy:{
+ type:'rest',
+ url:'/cpanel/cari/antonim/' +
this.recordResult.id,
+ noCache:false,
+ headers:{
+ Accept:'application/json'
+ },
+ reader:{
+ type:'json',
+ totalProperty:'numFound'
+ }
+ }
+ })
+ }),
new kateglo.modules.entry.grids.Relation({
- recordResult: this.recordResult.antonyms
+ recordResult:this.recordResult.antonyms
})
]
});
=======================================
---
/branches/kateglox/public/javascripts/cpanel/modules/entry/panels/Relation.js
Tue Nov 15 09:01:16 2011
+++
/branches/kateglox/public/javascripts/cpanel/modules/entry/panels/Relation.js
Thu Jan 26 09:11:22 2012
@@ -1,24 +1,30 @@
Ext.define('kateglo.modules.entry.panels.Relation', {
- extend: 'Ext.panel.Panel',
- title: 'Relation',
- layout: 'border',
- tbar: [
- {
- text: 'Save',
- iconCls: 'cpanel_sprite cpanel_disk'
- },
- '->',
- {
- text: 'Reset',
- iconCls: 'cpanel_sprite cpanel_arrow_undo'
- }
- ],
- initComponent: function() {
+ extend:'Ext.panel.Panel',
+ title:'Relation',
+ layout:'border',
+ initComponent:function () {
Ext.apply(this, {
- items: [
- new kateglo.modules.entry.forms.MeaningComboBox(),
+ items:[
+ new kateglo.modules.entry.forms.MeaningComboBox({
+ store:new Ext.data.Store({
+ model:'kateglo.models.Meaning',
+ pageSize:10000000,
+ proxy:{
+ type:'rest',
+ url:'/cpanel/cari/relasi/' +
this.recordResult.id,
+ noCache:false,
+ headers:{
+ Accept:'application/json'
+ },
+ reader:{
+ type:'json',
+ totalProperty:'numFound'
+ }
+ }
+ })
+ }),
new kateglo.modules.entry.grids.Relation({
- recordResult: this.recordResult.relations
+ recordResult:this.recordResult.relations
})
]
});
=======================================
---
/branches/kateglox/public/javascripts/cpanel/modules/entry/panels/Synonym.js
Tue Nov 15 09:01:16 2011
+++
/branches/kateglox/public/javascripts/cpanel/modules/entry/panels/Synonym.js
Thu Jan 26 09:11:22 2012
@@ -1,24 +1,39 @@
Ext.define('kateglo.modules.entry.panels.Synonym', {
- extend: 'Ext.panel.Panel',
- title: 'Synonym',
- layout: 'border',
- tbar: [
- {
- text: 'Save',
- iconCls: 'cpanel_sprite cpanel_disk'
- },
- '->',
- {
- text: 'Reset',
- iconCls: 'cpanel_sprite cpanel_arrow_undo'
- }
- ],
- initComponent: function() {
+ extend:'Ext.panel.Panel',
+ title:'Synonym',
+ layout:'border',
+ initComponent:function () {
Ext.apply(this, {
- items: [
- new kateglo.modules.entry.forms.MeaningComboBox(),
+ items:[
+ new kateglo.modules.entry.forms.MeaningComboBox({
+ store:new Ext.data.Store({
+ model:'kateglo.models.Meaning',
+ pageSize:10000000,
+ proxy:{
+ type:'rest',
+ url:'/cpanel/cari/sinonim/' +
this.recordResult.id,
+ noCache:false,
+ headers:{
+ Accept:'application/json'
+ },
+ reader:{
+ type:'json',
+ totalProperty:'numFound'
+ }
+ }
+ }),
+ selectCallback:function (field, value) {
+ console.log(field.getStore());
+ var gridStore =
field.up().up().getComponent(1).getStore();
+ if (gridStore.getById(value[0].getId()) == null) {
+ gridStore.add(value[0]);
+
field.getStore().removeAt(field.getStore().indexOfId(value[0].getId));
+ }
+ field.selectText(0, field.value.length);
+ }
+ }),
new kateglo.modules.entry.grids.Relation({
- recordResult: this.recordResult.synonyms
+ recordResult:this.recordResult.synonyms
})
]
});
=======================================
--- /branches/kateglox/public/javascripts/cpanel/stores/Meaning.js Tue Nov
15 09:01:16 2011
+++ /branches/kateglox/public/javascripts/cpanel/stores/Meaning.js Thu Jan
26 09:11:22 2012
@@ -4,7 +4,7 @@
pageSize: 10000000,
proxy: {
type: 'rest',
- url : '/kamus/arti',
+ url : '/cpanel/kamus/arti',
noCache: false,
headers: {
Accept: 'application/json'
=======================================
--- /branches/kateglox/tools/luceneindexing.php Wed Nov 16 00:13:02 2011
+++ /branches/kateglox/tools/luceneindexing.php Thu Jan 26 09:11:22 2012
@@ -113,23 +113,23 @@
}
/*@var $equivalent kateglo\application\models\Equivalent */
- foreach ( $entry->getEquivalents () as $equivalent ) {
- $doc->addField ( 'foreign', $equivalent->getForeign()->getForeign() );
- $equivalentData['foreign'] = $equivalent->getForeign()->getForeign();
-
- $doc->addField ( 'language',
$equivalent->getForeign()->getLanguage()->getLanguage() );
- $equivalentData['language'] =
$equivalent->getForeign()->getLanguage()->getLanguage();
-
- $disciplineData = array();
- /*@var $discipline kateglo\application\models\Discipline */
- foreach ($equivalent->getDisciplines() as $disciplineEq) {
- $doc->addField ( 'equivalentDiscipline',
$disciplineEq->getDiscipline() );
- $disciplineData[] = $disciplineEq->getDiscipline();
- }
- $equivalentData['discipline'] = $disciplineData;
-
- $doc->addField('equivalent', json_encode($equivalentData));
- }
+ foreach ( $entry->getEquivalents () as $equivalent ) {
+ $doc->addField ( 'foreign',
$equivalent->getForeign()->getForeign() );
+ $equivalentData['foreign'] =
$equivalent->getForeign()->getForeign();
+
+ $doc->addField ( 'language',
$equivalent->getForeign()->getLanguage()->getLanguage() );
+ $equivalentData['language'] =
$equivalent->getForeign()->getLanguage()->getLanguage();
+
+ $disciplineData = array();
+ /*@var $discipline kateglo\application\models\Discipline */
+ foreach ($equivalent->getDisciplines() as $disciplineEq) {
+ $doc->addField ( 'equivalentDiscipline',
$disciplineEq->getDiscipline() );
+ $disciplineData[] = $disciplineEq->getDiscipline();
+ }
+ $equivalentData['discipline'] = $disciplineData;
+
+ $doc->addField('equivalent', json_encode($equivalentData));
+ }
$solr->addDocument ( $doc );