X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/df390922e80d10dc16b9b301171bd2aac14f1f22..21b64ed13a3b23e10e36e85a1d5cd1ec3127dcd3:/src/file.c diff --git a/src/file.c b/src/file.c index a9f3c32c..6334676b 100644 --- a/src/file.c +++ b/src/file.c @@ -3,6 +3,7 @@ * * Copyright (C) 2003-2005, Evan Battaglia * Copyright (C) 2012, Guilhem Bonnefille + * Copyright (C) 2012-2013, Rob Norris * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,8 +26,11 @@ #endif #include "viking.h" +#include "jpg.h" #include "gpx.h" +#include "geojson.h" #include "babel.h" +#include "gpsmapper.h" #include #include @@ -34,23 +38,18 @@ #ifdef HAVE_UNISTD_H #include #endif -#ifdef WINDOWS -#define realpath(X,Y) _fullpath(Y,X,MAX_PATH) -#endif #include #include #include +#include "file.h" +#include "misc/strtod.h" + #define TEST_BOOLEAN(str) (! ((str)[0] == '\0' || (str)[0] == '0' || (str)[0] == 'n' || (str)[0] == 'N' || (str)[0] == 'f' || (str)[0] == 'F') ) #define VIK_MAGIC "#VIK" #define GPX_MAGIC "type)->params; VikLayerFuncGetParam get_param = vik_layer_get_interface(l->type)->get_param; @@ -152,7 +151,7 @@ static void write_layer_params_and_data ( VikLayer *l, FILE *f ) if ( vik_layer_get_interface(l->type)->write_file_data ) { fprintf ( f, "\n\n~LayerData\n" ); - vik_layer_get_interface(l->type)->write_file_data ( l, f ); + vik_layer_get_interface(l->type)->write_file_data ( l, f, dirpath ); fprintf ( f, "~EndLayerData\n" ); } /* foreach param: @@ -161,7 +160,7 @@ static void write_layer_params_and_data ( VikLayer *l, FILE *f ) */ } -static void file_write ( VikAggregateLayer *top, FILE *f, gpointer vp ) +static void file_write ( VikAggregateLayer *top, FILE *f, gpointer vp, const gchar *dirpath ) { Stack *stack = NULL; VikLayer *current_layer; @@ -203,7 +202,7 @@ static void file_write ( VikAggregateLayer *top, FILE *f, gpointer vp ) { current_layer = VIK_LAYER(((GList *)stack->data)->data); fprintf ( f, "\n~Layer %s\n", vik_layer_get_interface(current_layer->type)->fixed_layer_name ); - write_layer_params_and_data ( current_layer, f ); + write_layer_params_and_data ( current_layer, f, dirpath ); if ( current_layer->type == VIK_LAYER_AGGREGATE && !vik_aggregate_layer_is_empty(VIK_AGGREGATE_LAYER(current_layer)) ) { push(&stack); @@ -255,9 +254,14 @@ static void string_list_delete ( gpointer key, gpointer l, gpointer user_data ) static void string_list_set_param (gint i, GList *list, gpointer *layer_and_vp) { - VikLayerParamData x; - x.sl = list; - vik_layer_set_param ( VIK_LAYER(layer_and_vp[0]), i, x, layer_and_vp[1], TRUE ); + VikLayerSetParam vlsp; + vlsp.id = i; + vlsp.data.sl = list; + vlsp.vp = layer_and_vp[1]; + vlsp.is_file_operation = TRUE; + vlsp.dirpath = (const gchar*)layer_and_vp[2]; + + vik_layer_set_param ( VIK_LAYER(layer_and_vp[0]), &vlsp ); } /** @@ -268,9 +272,9 @@ static void string_list_set_param (gint i, GList *list, gpointer *layer_and_vp) * TODO flow up line number(s) / error messages of problems encountered... * */ -static gboolean file_read ( VikAggregateLayer *top, FILE *f, VikViewport *vp ) +static gboolean file_read ( VikAggregateLayer *top, FILE *f, const gchar *dirpath, VikViewport *vp ) { - Stack *stack; + Stack *stack = NULL; struct LatLon ll = { 0.0, 0.0 }; gchar buffer[4096]; gchar *line; @@ -344,7 +348,7 @@ static gboolean file_read ( VikAggregateLayer *top, FILE *f, VikViewport *vp ) } else { - stack->data = (gpointer) vik_layer_create ( type, vp, NULL, FALSE ); + stack->data = (gpointer) vik_layer_create ( type, vp, FALSE ); params = vik_layer_get_interface(type)->params; params_count = vik_layer_get_interface(type)->params_count; } @@ -359,9 +363,10 @@ static gboolean file_read ( VikAggregateLayer *top, FILE *f, VikViewport *vp ) else { /* add any string lists we've accumulated */ - gpointer layer_and_vp[2]; + gpointer layer_and_vp[3]; layer_and_vp[0] = stack->data; layer_and_vp[1] = vp; + layer_and_vp[2] = (gpointer)dirpath; g_hash_table_foreach ( string_lists, (GHFunc) string_list_set_param, layer_and_vp ); g_hash_table_remove_all ( string_lists ); @@ -387,7 +392,7 @@ static gboolean file_read ( VikAggregateLayer *top, FILE *f, VikViewport *vp ) if ( stack->data && vik_layer_get_interface(VIK_LAYER(stack->data)->type)->read_file_data ) { /* must read until hits ~EndLayerData */ - if ( ! vik_layer_get_interface(VIK_LAYER(stack->data)->type)->read_file_data ( VIK_LAYER(stack->data), f ) ) + if ( ! vik_layer_get_interface(VIK_LAYER(stack->data)->type)->read_file_data ( VIK_LAYER(stack->data), f, dirpath ) ) successful_read = FALSE; } else @@ -434,13 +439,13 @@ static gboolean file_read ( VikAggregateLayer *top, FILE *f, VikViewport *vp ) // However we'll still carry and attempt to read whatever we can } else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "xmpp", eq_pos ) == 0) /* "hard coded" params: global & for all layer-types */ - vik_viewport_set_xmpp ( VIK_VIEWPORT(vp), strtod ( line+5, NULL ) ); + vik_viewport_set_xmpp ( VIK_VIEWPORT(vp), strtod_i8n ( line+5, NULL ) ); else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "ympp", eq_pos ) == 0) - vik_viewport_set_ympp ( VIK_VIEWPORT(vp), strtod ( line+5, NULL ) ); + vik_viewport_set_ympp ( VIK_VIEWPORT(vp), strtod_i8n ( line+5, NULL ) ); else if ( stack->under == NULL && eq_pos == 3 && strncasecmp ( line, "lat", eq_pos ) == 0 ) - ll.lat = strtod ( line+4, NULL ); + ll.lat = strtod_i8n ( line+4, NULL ); else if ( stack->under == NULL && eq_pos == 3 && strncasecmp ( line, "lon", eq_pos ) == 0 ) - ll.lon = strtod ( line+4, NULL ); + ll.lon = strtod_i8n ( line+4, NULL ); else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "mode", eq_pos ) == 0 && strcasecmp ( line+5, "utm" ) == 0) vik_viewport_set_drawmode ( VIK_VIEWPORT(vp), VIK_VIEWPORT_DRAWMODE_UTM); else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "mode", eq_pos ) == 0 && strcasecmp ( line+5, "expedia" ) == 0) @@ -501,7 +506,7 @@ static gboolean file_read ( VikAggregateLayer *top, FILE *f, VikViewport *vp ) } else { switch ( params[i].type ) { - case VIK_LAYER_PARAM_DOUBLE: x.d = strtod(line, NULL); break; + case VIK_LAYER_PARAM_DOUBLE: x.d = strtod_i8n(line, NULL); break; case VIK_LAYER_PARAM_UINT: x.u = strtoul(line, NULL, 10); break; case VIK_LAYER_PARAM_INT: x.i = strtol(line, NULL, 10); break; case VIK_LAYER_PARAM_BOOLEAN: x.b = TEST_BOOLEAN(line); break; @@ -510,7 +515,14 @@ static gboolean file_read ( VikAggregateLayer *top, FILE *f, VikViewport *vp ) /* STRING or STRING_LIST -- if STRING_LIST, just set param to add a STRING */ default: x.s = line; } - vik_layer_set_param ( VIK_LAYER(stack->data), i, x, vp, TRUE ); + + VikLayerSetParam vlsp; + vlsp.id = i; + vlsp.data = x; + vlsp.vp = vp; + vlsp.is_file_operation = TRUE; + vlsp.dirpath = dirpath; + vik_layer_set_param ( VIK_LAYER(stack->data), &vlsp ); } found_match = TRUE; break; @@ -549,7 +561,7 @@ name=this } if ( ll.lat != 0.0 || ll.lon != 0.0 ) - vik_viewport_set_center_latlon ( VIK_VIEWPORT(vp), &ll ); + vik_viewport_set_center_latlon ( VIK_VIEWPORT(vp), &ll, TRUE ); if ( ( ! VIK_LAYER(top)->visible ) && VIK_LAYER(top)->realized ) vik_treeview_item_set_visible ( VIK_LAYER(top)->vt, &(VIK_LAYER(top)->iter), FALSE ); @@ -577,7 +589,7 @@ if "[LayerData]" /* ---------------------------------------------------- */ -static FILE *xfopen ( const char *fn, const char *mode ) +static FILE *xfopen ( const char *fn ) { if ( strcmp(fn,"-") == 0 ) return stdin; @@ -599,86 +611,127 @@ static void xfclose ( FILE *f ) gboolean check_file_magic_vik ( const gchar *filename ) { gboolean result = FALSE; - FILE *ff = xfopen ( filename, "r" ); + FILE *ff = xfopen ( filename ); if ( ff ) { - result = check_magic ( ff, VIK_MAGIC ); + result = check_magic ( ff, VIK_MAGIC, VIK_MAGIC_LEN ); xfclose ( ff ); } return result; } -VikLoadType_t a_file_load ( VikAggregateLayer *top, VikViewport *vp, const gchar *filename_or_uri ) +/** + * append_file_ext: + * + * Append a file extension, if not already present. + * + * Returns: a newly allocated string + */ +gchar *append_file_ext ( const gchar *filename, VikFileType_t type ) +{ + gchar *new_name = NULL; + const gchar *ext = NULL; + + /* Select an extension */ + switch (type) + { + case FILE_TYPE_GPX: + ext = ".gpx"; + break; + case FILE_TYPE_KML: + ext = ".kml"; + break; + case FILE_TYPE_GEOJSON: + ext = ".geojson"; + break; + case FILE_TYPE_GPSMAPPER: + case FILE_TYPE_GPSPOINT: + default: + /* Do nothing, ext already set to NULL */ + break; + } + + /* Do */ + if ( ext != NULL && ! a_file_check_ext ( filename, ext ) ) + new_name = g_strconcat ( filename, ext, NULL ); + else + /* Simply duplicate */ + new_name = g_strdup ( filename ); + + return new_name; +} + +VikLoadType_t a_file_load ( VikAggregateLayer *top, VikViewport *vp, VikTrwLayer *vtl, const gchar *filename_or_uri ) { g_return_val_if_fail ( vp != NULL, LOAD_TYPE_READ_FAILURE ); char *filename = (char *)filename_or_uri; if (strncmp(filename, "file://", 7) == 0) { + // Consider replacing this with: + // filename = g_filename_from_uri ( entry, NULL, NULL ); + // Since this doesn't support URIs properly (i.e. will failure if is it has %20 characters in it) filename = filename + 7; -#ifdef WINDOWS - // For drag and drop we receive URIs like 'file:///c:/path/to/file' - // Thus may need to ignore the leading '/' - if ( strlen (filename) > 3 ) { - if ( (strncmp (filename, "/", 1) == 0) && (strncmp (filename+2, ":", 1) == 0) ) - filename = filename + 1; - } -#endif g_debug ( "Loading file %s from URI %s", filename, filename_or_uri ); } - FILE *f = xfopen ( filename, "r" ); + FILE *f = xfopen ( filename ); if ( ! f ) return LOAD_TYPE_READ_FAILURE; - // Enables relative paths in a .vik file to work - // Also allows us to remember what directory we where using - gchar *dir = g_path_get_dirname ( filename ); - if ( dir ) { - if ( g_chdir ( dir ) ) { - g_warning ( "Could not change directory to %s", dir ); - } - g_free (dir); - } - VikLoadType_t load_answer = LOAD_TYPE_OTHER_SUCCESS; + gchar *absolute = file_realpath_dup ( filename ); + gchar *dirpath = NULL; + if ( absolute ) + dirpath = g_path_get_dirname ( absolute ); + g_free ( absolute ); + // Attempt loading the primary file type first - our internal .vik file: - if ( check_magic ( f, VIK_MAGIC ) ) + if ( check_magic ( f, VIK_MAGIC, VIK_MAGIC_LEN ) ) { - if ( file_read ( top, f, vp ) ) + if ( file_read ( top, f, dirpath, vp ) ) load_answer = LOAD_TYPE_VIK_SUCCESS; else load_answer = LOAD_TYPE_VIK_FAILURE_NON_FATAL; } + else if ( a_jpg_magic_check ( filename ) ) { + if ( ! a_jpg_load_file ( top, filename, vp ) ) + load_answer = LOAD_TYPE_UNSUPPORTED_FAILURE; + } else { // For all other file types which consist of tracks, routes and/or waypoints, // must be loaded into a new TrackWaypoint layer (hence it be created) gboolean success = TRUE; // Detect load failures - mainly to remove the layer created as it's not required - VikLayer *vtl = vik_layer_create ( VIK_LAYER_TRW, vp, NULL, FALSE ); + // Add to specified layer + gboolean add_new = !IS_VIK_TRW_LAYER(vtl); + if (add_new) { + vtl = VIK_TRW_LAYER (vik_layer_create ( VIK_LAYER_TRW, vp, FALSE )); + vik_layer_rename ( VIK_LAYER(vtl), a_file_basename ( filename ) ); + } // In fact both kml & gpx files start the same as they are in xml - if ( check_file_ext ( filename, ".kml" ) && check_magic ( f, GPX_MAGIC ) ) { + if ( a_file_check_ext ( filename, ".kml" ) && check_magic ( f, GPX_MAGIC, GPX_MAGIC_LEN ) ) { // Implicit Conversion - if ( ! ( success = a_babel_convert_from ( VIK_TRW_LAYER(vtl), "-i kml", filename, NULL, NULL, NULL ) ) ) { + ProcessOptions po = { "-i kml", filename, NULL, NULL, NULL, NULL }; + if ( ! ( success = a_babel_convert_from ( vtl, &po, NULL, NULL, NULL ) ) ) { load_answer = LOAD_TYPE_GPSBABEL_FAILURE; } } // NB use a extension check first, as a GPX file header may have a Byte Order Mark (BOM) in it // - which currently confuses our check_magic function - else if ( check_file_ext ( filename, ".gpx" ) || check_magic ( f, GPX_MAGIC ) ) { - if ( ! ( success = a_gpx_read_file ( VIK_TRW_LAYER(vtl), f ) ) ) { + else if ( a_file_check_ext ( filename, ".gpx" ) || check_magic ( f, GPX_MAGIC, GPX_MAGIC_LEN ) ) { + if ( ! ( success = a_gpx_read_file ( vtl, f, dirpath ) ) ) { load_answer = LOAD_TYPE_GPX_FAILURE; } } else { // Try final supported file type - if ( ! ( success = a_gpspoint_read_file ( VIK_TRW_LAYER(vtl), f ) ) ) { - // Failure here means we don't know how to handle the file + if ( ! ( success = a_gpspoint_read_file ( vtl, f, dirpath ) ) ) { + // Failure here means we don't know how to handle the file load_answer = LOAD_TYPE_UNSUPPORTED_FAILURE; - } + } } - // Clean up when we can't handle the file if ( ! success ) { // free up layer @@ -686,12 +739,18 @@ VikLoadType_t a_file_load ( VikAggregateLayer *top, VikViewport *vp, const gchar } else { // Complete the setup from the successful load - vik_layer_rename ( vtl, a_file_basename ( filename ) ); - vik_layer_post_read ( vtl, vp, TRUE ); - vik_aggregate_layer_add_layer ( top, vtl, FALSE ); - vik_trw_layer_auto_set_view ( VIK_TRW_LAYER(vtl), vp ); + vik_layer_post_read ( VIK_LAYER(vtl), vp, TRUE ); + if (add_new) { + vik_aggregate_layer_add_layer ( top, VIK_LAYER(vtl), FALSE ); + } + else { + // Make it more accessible in layers panel + vik_layer_expand_tree ( VIK_LAYER(vtl) ); + } + vik_trw_layer_auto_set_view ( vtl, vp ); } } + g_free ( dirpath ); xfclose(f); return load_answer; } @@ -709,16 +768,24 @@ gboolean a_file_save ( VikAggregateLayer *top, gpointer vp, const gchar *filenam return FALSE; // Enable relative paths in .vik files to work - // Also allows us to remember what directory we where using + gchar *cwd = g_get_current_dir(); gchar *dir = g_path_get_dirname ( filename ); if ( dir ) { if ( g_chdir ( dir ) ) { g_warning ( "Could not change directory to %s", dir ); } - g_free (dir); } - file_write ( top, f, vp ); + file_write ( top, f, vp, dir ); + g_free (dir); + + // Restore previous working directory + if ( cwd ) { + if ( g_chdir ( cwd ) ) { + g_warning ( "Could not return to directory %s", cwd ); + } + g_free (cwd); + } fclose(f); f = NULL; @@ -727,21 +794,10 @@ gboolean a_file_save ( VikAggregateLayer *top, gpointer vp, const gchar *filenam } -const gchar *a_file_basename ( const gchar *filename ) -{ - const gchar *t = filename + strlen(filename) - 1; - while ( --t > filename ) - if ( *(t-1) == FILE_SEP ) - break; - if ( t >= filename ) - return t; - return filename; -} - /* example: - gboolean is_gpx = check_file_ext ( "a/b/c.gpx", ".gpx" ); + gboolean is_gpx = a_file_check_ext ( "a/b/c.gpx", ".gpx" ); */ -gboolean check_file_ext ( const gchar *filename, const gchar *fileext ) +gboolean a_file_check_ext ( const gchar *filename, const gchar *fileext ) { g_return_val_if_fail ( filename != NULL, FALSE ); g_return_val_if_fail ( fileext && fileext[0]=='.', FALSE ); @@ -773,6 +829,9 @@ gboolean a_file_export ( VikTrwLayer *vtl, const gchar *filename, VikFileType_t FILE *f = g_fopen ( filename, "w" ); if ( f ) { + gboolean result = TRUE; + gchar *dirpath = g_path_get_dirname ( filename ); + if ( trk ) { switch ( file_type ) { case FILE_TYPE_GPX: @@ -789,14 +848,16 @@ gboolean a_file_export ( VikTrwLayer *vtl, const gchar *filename, VikFileType_t a_gpsmapper_write_file ( vtl, f ); break; case FILE_TYPE_GPX: - a_gpx_write_file ( vtl, f, &options ); + a_gpx_write_file ( vtl, f, &options, dirpath ); break; case FILE_TYPE_GPSPOINT: - a_gpspoint_write_file ( vtl, f ); + a_gpspoint_write_file ( vtl, f, dirpath ); + break; + case FILE_TYPE_GEOJSON: + result = a_geojson_write_file ( vtl, f ); break; case FILE_TYPE_KML: fclose ( f ); - f = NULL; switch ( a_vik_get_kml_export_units () ) { case VIK_KML_EXPORT_UNITS_STATUTE: return a_babel_convert_to ( vtl, NULL, "-o kml", filename, NULL, NULL ); @@ -814,136 +875,25 @@ gboolean a_file_export ( VikTrwLayer *vtl, const gchar *filename, VikFileType_t g_critical("Houston, we've had a problem. file_type=%d", file_type); } } + g_free ( dirpath ); fclose ( f ); - f = NULL; - return TRUE; + return result; } return FALSE; } /** - * Just a wrapper around realpath, which itself is platform dependent - */ -char *file_realpath ( const char *path, char *real ) -{ - return realpath ( path, real ); -} - -/** - * Permission granted to use this code after personal correspondance - * Slightly reworked for better cross platform use, glibisms, function rename and a compacter format - * - * FROM http://www.codeguru.com/cpp/misc/misc/fileanddirectorynaming/article.php/c263 + * a_file_export_babel: */ - -// GetRelativeFilename(), by Rob Fisher. -// rfisher@iee.org -// http://come.to/robfisher - -// defines -#ifndef MAXPATHLEN -#define MAXPATHLEN 1024 -#endif -// The number of characters at the start of an absolute filename. e.g. in DOS, -// absolute filenames start with "X:\" so this value should be 3, in UNIX they start -// with "\" so this value should be 1. -#ifdef WINDOWS -#define ABSOLUTE_NAME_START 3 -#else -#define ABSOLUTE_NAME_START 1 -#endif - -// Given the absolute current directory and an absolute file name, returns a relative file name. -// For example, if the current directory is C:\foo\bar and the filename C:\foo\whee\text.txt is given, -// GetRelativeFilename will return ..\whee\text.txt. - -const gchar *file_GetRelativeFilename ( gchar *currentDirectory, gchar *absoluteFilename ) +gboolean a_file_export_babel ( VikTrwLayer *vtl, const gchar *filename, const gchar *format, + gboolean tracks, gboolean routes, gboolean waypoints ) { - gint afMarker = 0, rfMarker = 0; - gint cdLen = 0, afLen = 0; - gint i = 0; - gint levels = 0; - static gchar relativeFilename[MAXPATHLEN+1]; - - cdLen = strlen(currentDirectory); - afLen = strlen(absoluteFilename); - - // make sure the names are not too long or too short - if (cdLen > MAXPATHLEN || cdLen < ABSOLUTE_NAME_START+1 || - afLen > MAXPATHLEN || afLen < ABSOLUTE_NAME_START+1) { - return NULL; - } - - // Handle DOS names that are on different drives: - if (currentDirectory[0] != absoluteFilename[0]) { - // not on the same drive, so only absolute filename will do - strcpy(relativeFilename, absoluteFilename); - return relativeFilename; - } - - // they are on the same drive, find out how much of the current directory - // is in the absolute filename - i = ABSOLUTE_NAME_START; - while (i < afLen && i < cdLen && currentDirectory[i] == absoluteFilename[i]) { - i++; - } - - if (i == cdLen && (absoluteFilename[i] == G_DIR_SEPARATOR || absoluteFilename[i-1] == G_DIR_SEPARATOR)) { - // the whole current directory name is in the file name, - // so we just trim off the current directory name to get the - // current file name. - if (absoluteFilename[i] == G_DIR_SEPARATOR) { - // a directory name might have a trailing slash but a relative - // file name should not have a leading one... - i++; - } - - strcpy(relativeFilename, &absoluteFilename[i]); - return relativeFilename; - } - - // The file is not in a child directory of the current directory, so we - // need to step back the appropriate number of parent directories by - // using "..\"s. First find out how many levels deeper we are than the - // common directory - afMarker = i; - levels = 1; - - // count the number of directory levels we have to go up to get to the - // common directory - while (i < cdLen) { - i++; - if (currentDirectory[i] == G_DIR_SEPARATOR) { - // make sure it's not a trailing slash - i++; - if (currentDirectory[i] != '\0') { - levels++; - } - } - } - - // move the absolute filename marker back to the start of the directory name - // that it has stopped in. - while (afMarker > 0 && absoluteFilename[afMarker-1] != G_DIR_SEPARATOR) { - afMarker--; - } - - // check that the result will not be too long - if (levels * 3 + afLen - afMarker > MAXPATHLEN) { - return NULL; - } - - // add the appropriate number of "..\"s. - rfMarker = 0; - for (i = 0; i < levels; i++) { - relativeFilename[rfMarker++] = '.'; - relativeFilename[rfMarker++] = '.'; - relativeFilename[rfMarker++] = G_DIR_SEPARATOR; - } - - // copy the rest of the filename into the result string - strcpy(&relativeFilename[rfMarker], &absoluteFilename[afMarker]); - - return relativeFilename; + gchar *args = g_strdup_printf("%s %s %s -o %s", + tracks ? "-t" : "", + routes ? "-r" : "", + waypoints ? "-w" : "", + format); + gboolean result = a_babel_convert_to ( vtl, NULL, args, filename, NULL, NULL ); + g_free(args); + return result; } -/* END http://www.codeguru.com/cpp/misc/misc/fileanddirectorynaming/article.php/c263 */