Fix:Core:Cleanup

[navit-package] / navit / search.h

diff --git a/navit/search.h b/navit/search.h
index 494e89c..04547bf 100644 (file)
--- a/navit/search.h
+++ b/navit/search.h
@@ -1,37 +1,71 @@
+/**
+ * Navit, a modular navigation system.
+ * Copyright (C) 2005-2008 Navit Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301, USA.
+ */
+
 #ifndef NAVIT_SEARCH_H
 #define NAVIT_SEARCH_H
 
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct search_list_common {
+       struct item unique,item;
+       int selected;
+       struct pcoord *c;
+       char *town_name;
+       char *district_name;
+       char *postal;
+       char *postal_mask;
+};
+
 struct search_list_country {
-       struct item item;
+       struct search_list_common common;
        char *car;
        char *iso2;
        char *iso3;
        char *name;
+       char *flag;
 };
 
 struct search_list_town {
-       struct item item;
+       struct search_list_common common;
        struct item itemt;
-       struct pcoord *c;
-       char *postal;
        char *name;
        char *district;
 };
 
 struct search_list_street {
-       struct item item;
-       struct pcoord *c;
+       struct search_list_common common;
        char *name;
 };
 
+struct search_list_house_number {
+       struct search_list_common common;
+       char *house_number;
+};
+
 struct search_list_result {
+       int id;
        struct pcoord *c;
        struct search_list_country *country;
        struct search_list_town *town;
        struct search_list_street *street;
+       struct search_list_house_number *house_number;
 };
 
 /* prototypes */
@@ -41,8 +75,10 @@ struct search_list;
 struct search_list_result;
 struct search_list *search_list_new(struct mapset *ms);
 void search_list_search(struct search_list *this_, struct attr *search_attr, int partial);
+struct search_list_common *search_list_select(struct search_list *this_, enum attr_type attr_type, int id, int mode);
 struct search_list_result *search_list_get_result(struct search_list *this_);
 void search_list_destroy(struct search_list *this_);
+void search_init(void);
 /* end of prototypes */
 #ifdef __cplusplus
 }