diff -r d575fd691cf9 -r afe194b6b1cd searchengine/cpix/cpix/inc/public/appclass-hierarchy.txt
--- a/searchengine/cpix/cpix/inc/public/appclass-hierarchy.txt	Wed Jun 23 19:26:19 2010 +0300
+++ b/searchengine/cpix/cpix/inc/public/appclass-hierarchy.txt	Tue Jul 06 15:30:04 2010 +0300
@@ -23,65 +23,87 @@
     | [ _mimetype (opt) ]     {EStoreYes | EIndexNo}
     |
     +-- msg
-    | [ To         ]    {EStoreYes | EIndexTokenized} {ExcerptYes, if present}
-    | [ From       ]    {EStoreYes | EIndexTokenized} {ExcerptYes, if present}
-    | [ Body       ]    {EStoreYes | EIndexTokenized} {ExcerptYes}
-    | [ Folder     ]    {EStoreYes | EIndexNo}        {ExcerptNA}
-    | [ Subject    ]    {EStoreYes | EIndexTokenized} {ExcperptNo}
-    |
+    | [ To         ]    {EStoreYes | EIndexTokenized | EIndexFreeText} 	{ExcerptYes, if present}
+    | [ From       ]    {EStoreYes | EIndexTokenized | EIndexFreeText} 	{ExcerptYes, if present}
+    | [ Body       ]    {EStoreYes | EIndexTokenized } 								 	{ExcerptYes}
+    | [ Folder     ]    {EStoreYes | EIndexNo}        									{ExcerptNA}
+    | [ Subject    ]    {EStoreYes | EIndexTokenized} 									{ExcperptNo}
+    | [ Attachment ]	{EStoreYes | EIndexTokenized}										{ExcperptNo}
     |
     +-- file
     |     |
     |     |
     |     +-- content
-    |            | [ Contents  ]     {EStoreYes | EIndexTokenized}   {ExcerptYes}
-    |            | [ Name      ]     {EStoreYes | EIndexTokenized}   {ExcerptNo}
-    |            | [ BaseName  ]     {EStoreNo  | EIndexTokenized}   {ExcerptNo}
-    |            | [ Extension ]     {EStoreNo  | EIndexTokenized}      {ExcerptNo}
-    |            |
-    |            +-- folder
-    |              [ Name      ]     {EStoreYes | EIndexTokenized}      {ExcerptNo}
-    |              [ Extension ]     {EStoreYes | EIndexUnTokenized}    {ExcerptNA}
+    |     | [ Contents  ]     {EStoreYes | EIndexTokenized}   								{ExcerptYes}
+    |     | [ Name      ]     {EStoreYes | EIndexTokenized | EIndexFreeText}  {ExcerptNo}
+    |     | [ BaseName  ]     {EStoreNo  | EIndexTokenized | EIndexFreeText}  {ExcerptNo}
+    |     | [ Extension ]     {EStoreNo  | EIndexTokenized | EIndexFreeText}  {ExcerptNo}
+    |     |
+    |     +-- folder
+    |     [ Name      	]     {EStoreYes | EIndexTokenized | EIndexFreeText} 	{ExcerptNo}
+    |     [ Extension 	]     {EStoreYes | EIndexTokenized | EIndexFreeText}	{ExcerptNo}
     |
     |      
     +-- media
     |     | 
     |     |
     |     +-- audio
-    |     | [ Name           ]    {EStoreYes | EIndexTokenized}   {ExcerptYes}
-    |     | [ MediaId        ]    {EStoreYes | EIndexUnTokenized} {ExcerptNo}
-    |     | [ Title          ]    {EStoreYes | EIndexTokenized}   {ExcerptNo}
-    |     | [ ItemType       ]    {EStoreYes | EIndexUnTokenized} {ExcerptNo} 
-    |     | [ Extension      ]    {EStoreYes | EIndexTokenized}   {ExcerptYes}
-    |     | [ Album          ]    {EStoreYes | EIndexTokenized}   {ExcerptYes}
-    |     | [ AlbumArtist    ]    {EStoreYes | EIndexTokenized}   {ExcerptYes}
-    |     | [ OriginalArtist ]    {EStoreYes | EIndexTokenized}   {ExcerptYes}
-    |     | [ Composer       ]    {EStoreYes | EIndexTokenized}   {ExcerptYes}
-    |     | [ Artist         ]    {EStoreYes | EIndexTokenized}   {ExcerptYes}
-    |     | 
+    |     | [ Name           ]    {EStoreYes | EIndexTokenized | EIndexFreeText} 	{ExcerptYes}
+    |     | [ MediaId        ]    {EStoreYes | EIndexUnTokenized} 								{ExcerptNo}
+    |     | [ Title          ]    {EStoreYes | EIndexTokenized | EIndexFreeText}  {ExcerptNo}
+    |     | [ ItemType       ]    {EStoreYes | EIndexUnTokenized} 								{ExcerptNo} 
+    |     | [ Extension      ]    {EStoreYes | EIndexTokenized}   								{ExcerptNo}
+    |     | [ Artist         ]    {EStoreYes | EIndexTokenized | EIndexFreeText}  {ExcerptYes}
+    |     | [ Album          ]    {EStoreYes | EIndexTokenized | EIndexFreeText}  {ExcerptYes}
+    |     | [ AlbumArtist    ]    {EStoreYes | EIndexTokenized | EIndexFreeText}  {ExcerptYes}
+    |     | [ OriginalArtist ]    {EStoreYes | EIndexTokenized | EIndexFreeText} 	{ExcerptYes}
+    |     | [ Composer       ]    {EStoreYes | EIndexTokenized | EIndexFreeText}  {ExcerptYes}
+    |     | [ Author         ]    {EStoreYes | EIndexTokenized | EIndexFreeText}  {ExcerptYes}
+    |     | [ Comment        ]    {EStoreYes | EIndexTokenized}   								{ExcerptYes}
+    |	  | [ Description	 ]    {EStoreYes | EIndexTokenized}   								{ExcerptYes}
+    |     | [ Copyright      ]    {EStoreYes | EIndexTokenized}   								{ExcerptYes}
+    |	  | [ Genre			 ]    {EStoreYes | EIndexTokenized}   								{ExcerptYes}
+    |     | [ Size			 ]    {EStoreYes | EIndexTokenized}   								{ExcerptYes}
+    |     | [ Legal			 ]    {EStoreYes | EIndexTokenized}   								{ExcerptYes}
+    |	  | [ Track          ]    {EStoreYes | EIndexTokenized}   								{ExcerptNo}
+    |     | [ CaptureDate	 ]    {EStoreYes | EIndexUnTokenized}   							{ExcerptYes}
+    |	  | [ LastModifiedDate ]  {EStoreYes | EIndexUnTokenized}   							{ExcerptYes}
+    |	  | [ Duration		 ]    {EStoreYes | EIndexTokenized}   								{ExcerptNo}
     |     |
     |     +-- image
-    |     | [ Name           ]    {EStoreYes | EIndexTokenized}   {ExcerptNo}
-    |     | [ MediaId        ]    {EStoreYes | EIndexUnTokenized} {ExcerptNA}
-    |     | [ Title          ]    {EStoreYes | EIndexTokenized}   {ExcerptYes}
-    |     | [ ItemType       ]    {EStoreYes | EIndexUnTokenized} {ExcerptNA}
-    |     | [ Extension      ]    {EStoreYes | EIndexTokenized}   {ExcerptYes}
-    |     | [ Comment        ]    {EStoreYes | EIndexTokenized}   {ExcerptYes}
-    |     | [ DateTimeOrignal]    {EStoreYes | EIndexUnTokenized} {ExcerptNA}
-    |     |
+    |     | [ Name           ]    {EStoreYes | EIndexTokenized | EIndexFreeText}  {ExcerptNo}
+    |     | [ MediaId        ]    {EStoreYes | EIndexUnTokenized} 								{ExcerptNo}
+    |     | [ Title          ]    {EStoreYes | EIndexTokenized | EIndexFreeText}  {ExcerptYes}
+    |     | [ ItemType       ]    {EStoreYes | EIndexUnTokenized} 								{ExcerptNA}
+    |     | [ Extension      ]    {EStoreYes | EIndexTokenized}   								{ExcerptYes}
+    |     | [ Comment        ]    {EStoreYes | EIndexTokenized}   								{ExcerptYes}
+    |     | [ Description	 ]	  {EStoreYes | EIndexTokenized}   								{ExcerptYes}
+    |	  | [ Copyright		 ]    {EStoreYes | EIndexTokenized}   								{ExcerptYes}
+    |     | [ Genre			 ]    {EStoreYes | EIndexTokenized}   								{ExcerptYes}
+    |     | [ Legal			 ]	  {EStoreYes | EIndexTokenized}   								{ExcerptYes}
+    |     | [ Size           ]	  {EStoreYes | EIndexTokenized}   								{ExcerptYes}
+    |     | [ DateTimeOrignal  ]  {EStoreYes | EIndexUnTokenized} 								{ExcerptYes}
+    |     | [ LastModifiedDate ]  {EStoreYes | EIndexUnTokenized}   							{ExcerptYes}
     |     |    
     |     +-- video
-    |       [ Name           ]    {EStoreYes | EIndexTokenized}   {ExcerptYes}
-    |       [ MediaId        ]    {EStoreYes | EIndexUnTokenized} {ExcerptNo}
-    |       [ Title          ]    {EStoreYes | EIndexTokenized}   {ExcerptNo}
-    |       [ ItemType       ]    {EStoreYes | EIndexUnTokenized} {ExcerptYes}
-    |       [ Extension      ]    {EStoreYes | EIndexTokenized}   {ExcerptYes}
-    |       [ Artist         ]    {EStoreYes | EIndexTokenized}   {ExcerptYes}
-    |       [ Author         ]    {EStoreYes | EIndexTokenized}   {ExcerptYes}
-    |       [ Copyright      ]    {EStoreYes | EIndexTokenized}   {ExcerptYes}
-    |       [ Description    ]    {EStoreYes | EIndexTokenized}   {ExcerptYes}
-    |       [ Comment        ]    {EStoreYes | EIndexTokenized}   {ExcerptYes}
-    |
+    |       [ Name           ]    {EStoreYes | EIndexTokenized | EIndexFreeText}  {ExcerptYes}
+    |       [ MediaId        ]    {EStoreYes | EIndexUnTokenized} 								{ExcerptNo}
+    |       [ Title          ]    {EStoreYes | EIndexTokenized | EIndexFreeText}  {ExcerptNo}
+    |       [ ItemType       ]    {EStoreYes | EIndexUnTokenized} 								{ExcerptYes}
+    |       [ Extension      ]    {EStoreYes | EIndexTokenized }   								{ExcerptYes}
+    |       [ Artist         ]    {EStoreYes | EIndexTokenized | EIndexFreeText}  {ExcerptYes}
+    |       [ Author         ]    {EStoreYes | EIndexTokenized | EIndexFreeText}  {ExcerptYes}
+    |       [ Comment    	 ]    {EStoreYes | EIndexTokenized}   								{ExcerptYes}
+    |       [ Description    ]    {EStoreYes | EIndexTokenized}   								{ExcerptYes}    
+    |       [ Copyright      ]    {EStoreYes | EIndexTokenized}   								{ExcerptYes}
+    | 		[ Genre			 ]    {EStoreYes | EIndexTokenized}   								{ExcerptYes}
+    |		[ Size           ]	  {EStoreYes | EIndexTokenized}   								{ExcerptYes}
+    |       [ ResolutionUnit ]	  {EStoreYes | EIndexTokenized}   								{ExcerptYes}
+    |       [ Legal			 ]    {EStoreYes | EIndexTokenized}   								{ExcerptYes}
+    |		[ Track          ]    {EStoreYes | EIndexTokenized}   								{ExcerptNo}
+    |       [ CaptureDate	 ]    {EStoreYes | EIndexUnTokenized}   							{ExcerptYes}
+    |		[ LastModifiedDate ]  {EStoreYes | EIndexUnTokenized}   							{ExcerptYes}
+    |		[ Duration		 ]    {EStoreYes | EIndexTokenized}   								{ExcerptNo}
     |
     +-- contact
 	/* The order of fields in excerpt is as below. The order in this case
@@ -89,61 +111,62 @@
 	 */
     | [ GivenName           ]    {EStoreYes | EIndexTokenized | EIndexFreeText} {ExcerptNo}
     | [ FamilyName          ]    {EStoreYes | EIndexTokenized | EIndexFreeText} {ExcerptNo}
-    | [ PhoneNumber         ]    {EStoreYes | EIndexTokenized}   				{ExcerptYes}
-	| [ EMail               ]    {EStoreYes | EIndexTokenized}   				{ExcerptYes}
-	| [ SIPID               ]    {EStoreYes | EIndexTokenized}   				{ExcerptYes}
+    | [ PhoneNumber         ]    {EStoreYes | EIndexTokenized}   								{ExcerptYes}
+	| [ EMail               ]    {EStoreYes | EIndexTokenized}   								{ExcerptYes}
+	| [ SIPID               ]    {EStoreYes | EIndexTokenized}   								{ExcerptYes}
 	| [ CompanyName         ]    {EStoreYes | EIndexTokenized | EIndexFreeText} {ExcerptYes}
     | [ JobTitle            ]    {EStoreYes | EIndexTokenized | EIndexFreeText} {ExcerptYes}
-    | [ Note                ]    {EStoreYes | EIndexTokenized}   				{ExcerptYes}
+    | [ Note                ]    {EStoreYes | EIndexTokenized}   								{ExcerptYes}
 	/* The following fields are not displayed when 'Edit'-ing the contact.
 	 * The order here is arbitrary.
 	 */
-    | [ Address             ]    {EStoreYes | EIndexTokenized}   				{ExcerptYes}
+    | [ Address             ]    {EStoreYes | EIndexTokenized}   								{ExcerptYes}
     | [ SecondName          ]    {EStoreYes | EIndexTokenized | EIndexFreeText} {ExcerptYes}
-    | [ Suffix              ]    {EStoreYes | EIndexTokenized}   				{ExcerptYes}
-    | [ URL                 ]    {EStoreYes | EIndexTokenized}   				{ExcerptYes}
-    | [ PostOffice          ]    {EStoreYes | EIndexTokenized}   				{ExcerptYes}
-    | [ ExtendedAddress     ]    {EStoreYes | EIndexTokenized}   				{ExcerptYes}
-    | [ Locality            ]    {EStoreYes | EIndexTokenized}   				{ExcerptYes}
-    | [ Region              ]    {EStoreYes | EIndexTokenized}   				{ExcerptYes}
-    | [ PostCode            ]    {EStoreYes | EIndexTokenized}   				{ExcerptYes}
-    | [ Country             ]    {EStoreYes | EIndexTokenized}   				{ExcerptYes}
+    | [ Suffix              ]    {EStoreYes | EIndexTokenized}   								{ExcerptYes}
+    | [ URL                 ]    {EStoreYes | EIndexTokenized}   								{ExcerptYes}
+    | [ PostOffice          ]    {EStoreYes | EIndexTokenized}   								{ExcerptYes}
+    | [ ExtendedAddress     ]    {EStoreYes | EIndexTokenized}   								{ExcerptYes}
+    | [ Locality            ]    {EStoreYes | EIndexTokenized}   								{ExcerptYes}
+    | [ Region              ]    {EStoreYes | EIndexTokenized}   								{ExcerptYes}
+    | [ PostCode            ]    {EStoreYes | EIndexTokenized}   								{ExcerptYes}
+    | [ Country             ]    {EStoreYes | EIndexTokenized}   								{ExcerptYes}
     | [ Spouse              ]    {EStoreYes | EIndexTokenized | EIndexFreeText} {ExcerptYes}
     | [ Children            ]    {EStoreYes | EIndexTokenized | EIndexFreeText} {ExcerptYes}
-    | [ Class               ]    {EStoreYes | EIndexTokenized}   				{ExcerptYes}
-    | [ Prefix              ]    {EStoreYes | EIndexTokenized}   				{ExcerptYes}
+    | [ Class               ]    {EStoreYes | EIndexTokenized}   								{ExcerptYes}
+    | [ Prefix              ]    {EStoreYes | EIndexTokenized}   								{ExcerptYes}
     | [ AdditionalName      ]    {EStoreYes | EIndexTokenized | EIndexFreeText} {ExcerptYes}
-    | [ Fax                 ]    {EStoreYes | EIndexTokenized}   				{ExcerptYes}
+    | [ Fax                 ]    {EStoreYes | EIndexTokenized}   								{ExcerptYes}
     | [ Assistant  			]    {EStoreYes | EIndexTokenized | EIndexFreeText} {ExcerptYes}
     | [ Department		    ]    {EStoreYes | EIndexTokenized | EIndexFreeText} {ExcerptYes}
-    | [ IMAddress    		]    {EStoreYes | EIndexTokenized}   				{ExcerptYes}
-    | [ ServiceProvider     ]	 {EStoreYes | EIndexTokenized}   				{ExcerptYes}
-    | [ Birthday			]    {EStoreYes | EIndexTokenized}   				{ExcerptNo}
-    | [ Anniversary			]    {EStoreYes | EIndexTokenized}   				{ExcerptNo} 
+    | [ IMAddress    		]    {EStoreYes | EIndexTokenized}   								{ExcerptYes}
+    | [ ServiceProvider     ]	 {EStoreYes | EIndexTokenized}   								{ExcerptYes}
+    | [ Birthday			]    {EStoreYes | EIndexTokenized}   								{ExcerptNo}
+    | [ Anniversary			]    {EStoreYes | EIndexTokenized}   								{ExcerptNo} 
     |
     |
     +-- calendar
-    | [ Summary         ]    {EStoreYes | EIndexTokenized}   {ExcerptNo}
-    | [ Description     ]    {EStoreYes | EIndexTokenized}   {ExcerptYes}
-    | [ Location        ]    {EStoreYes | EIndexTokenized}   {ExcerptYes}
-    | [ StartTime       ] (YYYY MM DD HHSS) (TimeZone UTC)   {EStoreYes | EIndexUnTokenized}   {ExcerptNA}
-    | [ EndTime         ] (YYYY MM DD HHSS) (TimeZone UTC)   {EStoreYes | EIndexUnTokenized}   {ExcerptNA}
+    | [ Summary         ]    {EStoreYes | EIndexTokenized}   										{ExcerptNo}
+    | [ Description     ]    {EStoreYes | EIndexTokenized}   										{ExcerptYes}
+    | [ Location        ]    {EStoreYes | EIndexTokenized}   										{ExcerptYes}
+    | [ StartTime       ] 	 {EStoreYes | EIndexUnTokenized}   {ExcerptNA} (YYYY MM DD HH SS) (TimeZone UTC)   
+    | [ EndTime         ]    {EStoreYes | EIndexUnTokenized}   {ExcerptNA} (YYYY MM DD HH SS) (TimeZone UTC)
+    | [ Priority        ]    {EStoreYes | EIndexTokenized}   										{ExcerptNo}
     | 
     |    
     +-- bookmark
-    | [ Name       ]    {EStoreYes | EIndexTokenized}   {ExcerptNo}
-    | [ Url        ]    {EStoreYes | EIndexTokenized}   {ExcerptYes}
+    | [ Name       ]    	 {EStoreYes | EIndexTokenized}   										{ExcerptNo}
+    | [ Url        ]    	 {EStoreYes | EIndexTokenized}   										{ExcerptYes}
     |
     |
     +-- applications
-    | [ Name       ]    {EStoreYes | EIndexTokenized}                     {ExcerptNo}
-    | [ Uid        ]    {EStoreYes | EIndexTokenized | ENoAggregate}      {ExcerptNo}
-    | [ Path       ]    {EStoreYes | EIndexTokenized}                     {ExcerptNo}
+    | [ Name       ]    	 {EStoreYes | EIndexTokenized | EIndexFreeText}     {ExcerptNo}
+    | [ Uid        ]    	 {EStoreYes | EIndexTokenized | ENoAggregate}      	{ExcerptNo}
+    | [ Path       ]         {EStoreYes | EIndexTokenized}                     	{ExcerptNo}
     |
     |
     +-- notes
-    | [ Date       ]  (YYYY MM DD HHSS) {EStoreYes | EIndexUnTokenized}   {ExcerptNA}
-    | [ Memo       ]                    {EStoreYes | EIndexTokenized}     {ExcerptNo}
+    | [ Date       ]  	     {EStoreYes | EIndexUnTokenized}   									{ExcerptNA}
+    | [ Memo       ]         {EStoreYes | EIndexTokenized}     									{ExcerptNo}
 
 
 For instance, a document for an email message should have the