[Navit-cvs-commit] SF.net SVN: navit:[3569] trunk/navit/navit

[<mar...@us...>]

Revision: 3569
          http://navit.svn.sourceforge.net/navit/?rev=3569&view=rev
Author:   martin-s
Date:     2010-09-11 19:39:24 +0000 (Sat, 11 Sep 2010)

Log Message:
-----------
Add:Core:Export postal merge functions

Modified Paths:
--------------
    trunk/navit/navit/search.c
    trunk/navit/navit/search.h

Modified: trunk/navit/navit/search.c
===================================================================
--- trunk/navit/navit/search.c	2010-09-11 17:26:44 UTC (rev 3568)
+++ trunk/navit/navit/search.c	2010-09-11 19:39:24 UTC (rev 3569)
@@ -555,8 +555,8 @@
 
 }
 
-static char *
-postal_merge(char *mask, char *new)
+char *
+search_postal_merge(char *mask, char *new)
 {
 	dbg(1,"enter %s %s\n", mask, new);
 	int i;
@@ -581,6 +581,17 @@
 	return ret;
 }
 
+char *
+search_postal_merge_replace(char *mask, char *new)
+{
+	char *ret=search_postal_merge(mask, new);
+	if (!ret)
+		return mask;
+	g_free(mask);
+	return ret;
+}
+
+
 static int
 postal_match(char *postal, char *mask)
 {
@@ -612,7 +623,7 @@
 		le->list=g_list_append(le->list, slc);
 		return 1;
 	}
-	merged=postal_merge(slo->postal_mask, slc->postal);
+	merged=search_postal_merge(slo->postal_mask, slc->postal);
 	if (merged) {
 		g_free(slo->postal_mask);
 		slo->postal_mask=merged;

Modified: trunk/navit/navit/search.h
===================================================================
--- trunk/navit/navit/search.h	2010-09-11 17:26:44 UTC (rev 3568)
+++ trunk/navit/navit/search.h	2010-09-11 19:39:24 UTC (rev 3569)
@@ -76,6 +76,8 @@
 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);
+char *search_postal_merge(char *mask, char *new);
+char *search_postal_merge_replace(char *mask, char *new);
 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_);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.